summaryrefslogtreecommitdiff
path: root/common/usb_storage.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-02-15 22:55:56 +0100
committerWolfgang Denk <wd@denx.de>2009-02-15 22:55:56 +0100
commit952a6bdd77b6b0a780e76a0b17ad139f4ee6dfde (patch)
tree1582bc6f35cac2436307ee466a71f81ac6193a5a /common/usb_storage.c
parentf8eab9c3e15db68d20cad8e257da228b518cde85 (diff)
parent9704f9caf53f5cae547d8c5e1ae94aa4e57b160f (diff)
downloadu-boot-952a6bdd77b6b0a780e76a0b17ad139f4ee6dfde.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'common/usb_storage.c')
-rw-r--r--common/usb_storage.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 51f078948a..fec64f3c1f 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -878,7 +878,6 @@ static int usb_inquiry(ccb *srb, struct us_data *ss)
do {
memset(&srb->cmd[0], 0, 12);
srb->cmd[0] = SCSI_INQUIRY;
- srb->cmd[1] = srb->lun<<5;
srb->cmd[4] = 36;
srb->datalen = 36;
srb->cmdlen = 12;
@@ -902,7 +901,6 @@ static int usb_request_sense(ccb *srb, struct us_data *ss)
ptr = (char *)srb->pdata;
memset(&srb->cmd[0], 0, 12);
srb->cmd[0] = SCSI_REQ_SENSE;
- srb->cmd[1] = srb->lun << 5;
srb->cmd[4] = 18;
srb->datalen = 18;
srb->pdata = &srb->sense_buf[0];
@@ -922,7 +920,6 @@ static int usb_test_unit_ready(ccb *srb, struct us_data *ss)
do {
memset(&srb->cmd[0], 0, 12);
srb->cmd[0] = SCSI_TST_U_RDY;
- srb->cmd[1] = srb->lun << 5;
srb->datalen = 0;
srb->cmdlen = 12;
if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
@@ -942,7 +939,6 @@ static int usb_read_capacity(ccb *srb, struct us_data *ss)
do {
memset(&srb->cmd[0], 0, 12);
srb->cmd[0] = SCSI_RD_CAPAC;
- srb->cmd[1] = srb->lun << 5;
srb->datalen = 8;
srb->cmdlen = 12;
if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
@@ -957,7 +953,6 @@ static int usb_read_10(ccb *srb, struct us_data *ss, unsigned long start,
{
memset(&srb->cmd[0], 0, 12);
srb->cmd[0] = SCSI_READ10;
- srb->cmd[1] = srb->lun << 5;
srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;