usb: core: message: remember to reset 'ret' to 0 when necessary
authorFelipe Balbi <felipe.balbi@linux.intel.com>
Thu, 9 Nov 2017 10:59:58 +0000 (12:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Nov 2017 12:02:23 +0000 (13:02 +0100)
usb_control_msg() will return the amount of bytes transferred, if that
amount matches what we wanted to transfer, we need to reset 'ret' to 0
from usb_get_status().

Fixes: 2e43f0fe379c ("usb: core: add a 'type' parameter to usb_get_status()")
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/message.c

index ebaea51..77001bc 100644 (file)
@@ -975,6 +975,7 @@ int usb_get_status(struct usb_device *dev, int recip, int type, int target,
                }
 
                *(u32 *) data = le32_to_cpu(*(__le32 *) status);
+               ret = 0;
                break;
        case 2:
                if (type != USB_STATUS_TYPE_STANDARD) {
@@ -983,6 +984,7 @@ int usb_get_status(struct usb_device *dev, int recip, int type, int target,
                }
 
                *(u16 *) data = le16_to_cpu(*(__le16 *) status);
+               ret = 0;
                break;
        default:
                ret = -EIO;