Эх сурвалжийг харах

[PATCH] USB hub: don't return status > 0 from resume

finish_device_resume() in the hub driver isn't careful always to return
a negative code in all the error pathways.  It also doesn't return 0 in
all the success pathways.  This patch (as724) fixes the behavior.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern 19 жил өмнө
parent
commit
b40b7a905c

+ 4 - 1
drivers/usb/core/hub.c

@@ -1790,7 +1790,10 @@ static int finish_device_resume(struct usb_device *udev)
 	 * and device drivers will know about any resume quirks.
 	 * and device drivers will know about any resume quirks.
 	 */
 	 */
 	status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
 	status = usb_get_status(udev, USB_RECIP_DEVICE, 0, &devstatus);
-	if (status < 2)
+	if (status >= 0)
+		status = (status == 2 ? 0 : -ENODEV);
+
+	if (status)
 		dev_dbg(&udev->dev,
 		dev_dbg(&udev->dev,
 			"gone after usb resume? status %d\n",
 			"gone after usb resume? status %d\n",
 			status);
 			status);