summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2007-11-20 08:19:56 -0700
committerGrant Likely <grant.likely@secretlab.ca>2007-11-20 08:19:56 -0700
commitf92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch)
treeae33aacff092561e2c64eabc11a8adc5e2acea6b /common
parentefe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff)
parent9a337ddc154a10a26f117fd147b009abcdeba75a (diff)
downloadu-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')
-rw-r--r--common/cmd_scsi.c9
-rw-r--r--common/usb_storage.c2
2 files changed, 7 insertions, 4 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;
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 0f79f36..443d785 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -1195,7 +1195,7 @@ int usb_stor_get_info(struct usb_device *dev,struct us_data *ss,block_dev_desc_t
dev_desc->product[16] = 0;
dev_desc->revision[4] = 0;
#ifdef CONFIG_USB_BIN_FIXUP
- usb_bin_fixup(dev->descriptor, dev_desc->vendor, dev_desc->product);
+ usb_bin_fixup(dev->descriptor, (uchar *)dev_desc->vendor, (uchar *)dev_desc->product);
#endif /* CONFIG_USB_BIN_FIXUP */
USB_STOR_PRINTF("ISO Vers %X, Response Data %X\n",usb_stor_buf[2],usb_stor_buf[3]);
if(usb_test_unit_ready(pccb,ss)) {