[PATCH] usbcore: fix compile error with CONFIG_USB_SUSPEND=n

[Alan Stern <stern@rowland.harvard.edu>]

This patch (as647) fixes a small error introduced by a recent change to 
the USB core suspend/resume code.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---


On Tue, 31 Jan 2006, Andrew Morton wrote:

> Andrew Morton <akpm@osdl.org> wrote:
> >
> > drivers/usb/core/hub.c: In function `usb_resume_device':
> > drivers/usb/core/hub.c:1879: warning: `status' might be used uninitialized in this function
> > 
> > And yes, with CONFIG_USB_SUSPEND=n it is indeed buggy.
> > 
> > Can we please tighten things up a bit over there?
> 
> This bug is still present in Greg's tree.

This should fix it.

Alan Stern


Index: usb-2.6/drivers/usb/core/hub.c
===================================================================
--- usb-2.6.orig/drivers/usb/core/hub.c
+++ usb-2.6/drivers/usb/core/hub.c
@@ -1890,8 +1890,8 @@ int usb_resume_device(struct usb_device 
 			status = hub_port_resume(hdev_to_hub(udev->parent),
 					udev->portnum, udev);
 		} else
-			status = 0;
 #endif
+			status = 0;
 	} else
 		status = finish_device_resume(udev);
 	if (status < 0)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/