diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:34 +0200 |
| commit | 06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8 (patch) | |
| tree | 3c7c238c81aa91405159959906f31f6195aa6217 /drivers/usb | |
| parent | b697fba4a5c5395a9db271efa286870191418040 (diff) | |
| parent | b917f7864115a35fbb9e69af2c1d553a110a37fc (diff) | |
| download | barebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.gz barebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/storage/transport.c | 1 | ||||
| -rw-r--r-- | drivers/usb/storage/usb.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index 48ccee2072..5186508ba6 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c @@ -115,6 +115,7 @@ int usb_stor_Bulk_transport(struct us_blk_dev *usb_blkdev, cbw.Length = cmdlen; /* copy the command payload */ + memset(cbw.CDB, 0, sizeof(cbw.CDB)); memcpy(cbw.CDB, cmd, cbw.Length); /* send it to out endpoint */ diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index fda24d6167..63d624e91b 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -142,7 +142,7 @@ exit: static int usb_stor_test_unit_ready(struct us_blk_dev *usb_blkdev) { - u8 cmd[12]; + u8 cmd[6]; int ret; memset(cmd, 0, sizeof(cmd)); @@ -439,7 +439,7 @@ static int usb_stor_scan(struct usb_device *usbdev, struct us_data *us) int num_devs = 0; /* obtain the max LUN */ - us->max_lun = 1; + us->max_lun = 0; if (us->protocol == US_PR_BULK) us->max_lun = usb_stor_Bulk_max_lun(us); |