From d656fa32b13424701bb85f6b5183ea869b363799 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 9 Nov 2017 12:59:58 +0200 Subject: usb: core: message: remember to reset 'ret' to 0 when necessary 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 Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/message.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/usb') diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index ebaea514161f..77001bcfc504 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -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; -- cgit v1.2.3