diff options
| author | Andre Przywara <osp@andrep.de> | 2015-07-02 01:04:23 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-11 08:01:54 -0400 |
| commit | c7d0fd797ec2ce3acd3cd7ed53971f431f8c6072 (patch) | |
| tree | 4ac5abf8ad8ec35a7c573d6cede2e9a2fcc0c99c | |
| parent | 2650dbcf8a9ddfee4c5bf2d1c961c303988c9f97 (diff) | |
| download | u-boot-c7d0fd797ec2ce3acd3cd7ed53971f431f8c6072.tar.gz u-boot-c7d0fd797ec2ce3acd3cd7ed53971f431f8c6072.tar.bz2 u-boot-c7d0fd797ec2ce3acd3cd7ed53971f431f8c6072.zip | |
scsi: fix compiler warning with DEBUG and 48bit LBAs
Commit 2b42c9317db ("ahci: support LBA48 data reads for 2+TB drives")
introduced conditional code which triggers a warning when compiled
with DEBUG enabled:
In file included from common/cmd_scsi.c:12:0:
common/cmd_scsi.c: In function 'scsi_read':
include/common.h:109:4: warning: 'smallblks' may be used uninitialized in this function [-Wmaybe-uninitialized]
...
Since this is for debug only, take the easy way and initialize the
variable explicitly on declaration to avoid the warning.
(Fix a nearby whitespace error on the way.)
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Andre Przywara <osp@andrep.de>
| -rw-r--r-- | common/cmd_scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index aaca3e8a2a..31c43195e4 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -368,7 +368,7 @@ static ulong scsi_read(int device, lbaint_t blknr, lbaint_t blkcnt, { lbaint_t start, blks; uintptr_t buf_addr; - unsigned short smallblks; + unsigned short smallblks = 0; ccb* pccb=(ccb *)&tempccb; device&=0xff; /* Setup device @@ -391,7 +391,7 @@ static ulong scsi_read(int device, lbaint_t blknr, lbaint_t blkcnt, scsi_setup_read16(pccb, start, blocks); start += blocks; blks -= blocks; - } else + } else #endif if (blks > SCSI_MAX_READ_BLK) { pccb->datalen=scsi_dev_desc[device].blksz * SCSI_MAX_READ_BLK; |