minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-12 13:35:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

usb: pass cache-aligned buffer to usb_get_descriptor()

Browse Source 
usb_get_descriptor passes it's buffer argument directly to
usb_control_msg() so it has to be properly aligned/padded.

Signed-off-by: Ilya Yanok <ilya.yanok@cogentembedded.com>
This commit is contained in:
Ilya Yanok 2012-07-15 04:43:50 +00:00 committed by Marek Vasut
parent 189a6956eb
commit 80ab414afd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/usb.c
View File

@ -799,12 +799,13 @@ int usb_new_device(struct usb_device *dev)
dev->epmaxpacketin[0] = 8; dev->epmaxpacketin[0] = 8;
dev->epmaxpacketout[0] = 8; dev->epmaxpacketout[0] = 8;
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, &dev->descriptor, 8); err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, tmpbuf, 8);
if (err < 8) { if (err < 8) {
printf("\n USB device not responding, " \ printf("\n USB device not responding, " \
"giving up (status=%lX)\n", dev->status); "giving up (status=%lX)\n", dev->status);
return 1; return 1;
} }
memcpy(&dev->descriptor, tmpbuf, 8);
#else #else
/* This is a Windows scheme of initialization sequence, with double /* This is a Windows scheme of initialization sequence, with double
* reset of the device (Linux uses the same sequence) * reset of the device (Linux uses the same sequence)
@ -893,7 +894,7 @@ int usb_new_device(struct usb_device *dev)
tmp = sizeof(dev->descriptor); tmp = sizeof(dev->descriptor);
err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, err = usb_get_descriptor(dev, USB_DT_DEVICE, 0,
&dev->descriptor, sizeof(dev->descriptor)); tmpbuf, sizeof(dev->descriptor));
if (err < tmp) { if (err < tmp) {
if (err < 0) if (err < 0)
printf("unable to get device descriptor (error=%d)\n", printf("unable to get device descriptor (error=%d)\n",
@ -903,6 +904,7 @@ int usb_new_device(struct usb_device *dev)
"(expected %i, got %i)\n", tmp, err); "(expected %i, got %i)\n", tmp, err);
return 1; return 1;
} }
memcpy(&dev->descriptor, tmpbuf, sizeof(dev->descriptor));
/* correct le values */ /* correct le values */
le16_to_cpus(&dev->descriptor.bcdUSB); le16_to_cpus(&dev->descriptor.bcdUSB);
le16_to_cpus(&dev->descriptor.idVendor); le16_to_cpus(&dev->descriptor.idVendor);