diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-08 14:28:11 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-10 10:59:24 -0500 |
| commit | d2174dbff1b492c682cc93903bc7456c2784e719 (patch) | |
| tree | af9c3de388a3f5c426b436a6f014da967564dcb9 | |
| parent | 5069436419b146a8b23f08ca757989bb3fd431a3 (diff) | |
| download | u-boot-d2174dbff1b492c682cc93903bc7456c2784e719.zip u-boot-d2174dbff1b492c682cc93903bc7456c2784e719.tar.gz u-boot-d2174dbff1b492c682cc93903bc7456c2784e719.tar.bz2 | |
scsi: Have scsi_init_dev_desc_priv() use memset
When we do not have CONFIG_BOUNCE_BUFFER enabled, inside of
scsi_init_dev_desc_priv we never set the 'bb' field to false, we only
initialize it to true when CONFIG_BOUNCE_BUFFER is set. Given that we
have a number of other fields here we had been explicitly setting to
zero, change to first calling memset to clear the struct and then
initialize only the fields that need non-zero default values.
Addresses-Coverity-ID: 467407 ("Uninitialized variables (UNINIT)")
Fixes: 81bd22e935dc ("rockchip: block: blk-uclass: add bounce buffer flag to blk_desc")
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | drivers/scsi/scsi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 779a34b..b76aadb 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -450,15 +450,12 @@ static void scsi_setup_test_unit_ready(struct scsi_cmd *pccb) */ static void scsi_init_dev_desc_priv(struct blk_desc *dev_desc) { + memset(dev_desc, 0, sizeof(struct blk_desc)); dev_desc->target = 0xff; dev_desc->lun = 0xff; dev_desc->log2blksz = LOG2_INVALID(typeof(dev_desc->log2blksz)); dev_desc->type = DEV_TYPE_UNKNOWN; - dev_desc->vendor[0] = 0; - dev_desc->product[0] = 0; - dev_desc->revision[0] = 0; - dev_desc->removable = false; #if IS_ENABLED(CONFIG_BOUNCE_BUFFER) dev_desc->bb = true; #endif /* CONFIG_BOUNCE_BUFFER */ |