diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
commit | f92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch) | |
tree | ae33aacff092561e2c64eabc11a8adc5e2acea6b /common/cmd_scsi.c | |
parent | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff) | |
parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
download | u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.zip u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.gz u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.bz2 |
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'common/cmd_scsi.c')
-rw-r--r-- | common/cmd_scsi.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index f563931..b2d4eb6 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -129,9 +129,12 @@ void scsi_scan(int mode) if((modi&0x80)==0x80) /* drive is removable */ scsi_dev_desc[scsi_max_devs].removable=TRUE; /* get info for this device */ - scsi_ident_cpy(&scsi_dev_desc[scsi_max_devs].vendor[0],&tempbuff[8],8); - scsi_ident_cpy(&scsi_dev_desc[scsi_max_devs].product[0],&tempbuff[16],16); - scsi_ident_cpy(&scsi_dev_desc[scsi_max_devs].revision[0],&tempbuff[32],4); + scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].vendor[0], + &tempbuff[8], 8); + scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].product[0], + &tempbuff[16], 16); + scsi_ident_cpy((unsigned char *)&scsi_dev_desc[scsi_max_devs].revision[0], + &tempbuff[32], 4); scsi_dev_desc[scsi_max_devs].target=pccb->target; scsi_dev_desc[scsi_max_devs].lun=pccb->lun; |