GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-27 17:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: usb_control_msg() propagate controller error code

Browse source 
Propagate the error returned by submit_control_msg() rather then always
returning -EIO when the hcd code indicates an error.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Hans de Goede 2015-05-10 14:10:14 +02:00 • committed by Simon Glass
parent 71b945267d
commit 651d95c8eb
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

@ -192,6 +192,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
void *data, unsigned short size, int timeout) void *data, unsigned short size, int timeout)
{ {
ALLOC_CACHE_ALIGN_BUFFER(struct devrequest, setup_packet, 1); ALLOC_CACHE_ALIGN_BUFFER(struct devrequest, setup_packet, 1);
int err;
if ((timeout == 0) && (!asynch_allowed)) { if ((timeout == 0) && (!asynch_allowed)) {
/* request for a asynch control pipe is not allowed */ /* request for a asynch control pipe is not allowed */
@ -209,8 +210,9 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
request, requesttype, value, index, size); request, requesttype, value, index, size);
dev->status = USB_ST_NOT_PROC; /*not yet processed */ dev->status = USB_ST_NOT_PROC; /*not yet processed */
if (submit_control_msg(dev, pipe, data, size, setup_packet) < 0) err = submit_control_msg(dev, pipe, data, size, setup_packet);
return -EIO; if (err < 0)
return err;
if (timeout == 0) if (timeout == 0)
return (int)size; return (int)size;