diff options
author | wdenk <wdenk> | 2003-09-11 19:48:06 +0000 |
---|---|---|
committer | wdenk <wdenk> | 2003-09-11 19:48:06 +0000 |
commit | a43278a43d522fba7fea0ed3045b718a9c8d22ac (patch) | |
tree | c21920a271992ce76e5e679c3e3e8bb11054d356 /common/usb_storage.c | |
parent | 7205e4075d8b50e4dd89fe39ed03860b23cbb704 (diff) | |
download | u-boot-a43278a43d522fba7fea0ed3045b718a9c8d22ac.tar.gz u-boot-a43278a43d522fba7fea0ed3045b718a9c8d22ac.tar.xz u-boot-a43278a43d522fba7fea0ed3045b718a9c8d22ac.zip |
* Patch by Gary Jennejohn, 11 Sep 2003:
- allow for longer timeouts for USB mass storage devices
* Patch by Denis Peter, 11 Sep 2003:
- fix USB data pointer assignment for bulk only transfer.
- prevent to display erased directories in FAT filesystem.
* Change output format for NAND flash - make it look like for other
memory, too
Diffstat (limited to 'common/usb_storage.c')
-rw-r--r-- | common/usb_storage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/usb_storage.c b/common/usb_storage.c index 70890361bb..f95a1d39be 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -613,7 +613,7 @@ int usb_stor_BBB_transport(ccb *srb, struct us_data *us) result = usb_bulk_msg(us->pusb_dev, pipe, srb->pdata, srb->datalen, &data_actlen, USB_CNTL_TIMEOUT*5); /* special handling of STALL in DATA phase */ if((result < 0) && (us->pusb_dev->status & USB_ST_STALLED)) { - printf("DATA:stall\n"); + USB_STOR_PRINTF("DATA:stall\n"); /* clear the STALL on the endpoint */ result = usb_stor_BBB_clear_endpt_stall(us, dir_in? us->ep_in : us->ep_out); if (result >= 0) @@ -1081,8 +1081,8 @@ int usb_storage_probe(struct usb_device *dev, unsigned int ifnum,struct us_data ss->irqpipe = usb_rcvintpipe(ss->pusb_dev, ss->ep_int); ss->irqmaxp = usb_maxpacket(dev, ss->irqpipe); dev->irq_handle=usb_stor_irq; - dev->privptr=(void *)ss; } + dev->privptr=(void *)ss; return 1; } |