summaryrefslogtreecommitdiff
path: root/common/cmd_scsi.c
diff options
context:
space:
mode:
authorStefano Babic <[email protected]>2015-07-17 11:22:56 +0200
committerStefano Babic <[email protected]>2015-07-17 11:22:56 +0200
commitf448c5d3200372fa73f340144d013fdecf4e2f1f (patch)
treeb17b66f67a22b553f66bcb22e69d62cb2a5bbe7e /common/cmd_scsi.c
parent425640256a7c5e9259f7583ee4eca1f3b70f8032 (diff)
parent605e15db2b54302364a2528d3c6604fbc57be846 (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'common/cmd_scsi.c')
-rw-r--r--common/cmd_scsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index aaca3e8a2ab..31c43195e45 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;