Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b1a7a3 authored by Alan Stern's avatar Alan Stern Committed by Rafael J. Wysocki
Browse files

USB: Add wakeup info to debugging messages 



This patch (as1487) improves the usbcore debugging output for port
suspend and bus suspend, by stating whether or not remote wakeup is
enabled.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 2e6ba515

drivers/usb/core/hcd.c

+5 −4
Original line number Diff line number Diff line
@@ -1959,8 +1959,9 @@ int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg) 
	int		status;

	int		old_state = hcd->state;



	dev_dbg(&rhdev->dev, "bus %s%s\n",

			(PMSG_IS_AUTO(msg) ? "auto-" : ""), "suspend");

	dev_dbg(&rhdev->dev, "bus %ssuspend, wakeup %d\n",

			(PMSG_IS_AUTO(msg) ? "auto-" : ""),

			rhdev->do_remote_wakeup);

	if (HCD_DEAD(hcd)) {

		dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "suspend");

		return 0;
@@ -1995,8 +1996,8 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) 
	int		status;

	int		old_state = hcd->state;



	dev_dbg(&rhdev->dev, "usb %s%s\n",

			(PMSG_IS_AUTO(msg) ? "auto-" : ""), "resume");

	dev_dbg(&rhdev->dev, "usb %sresume\n",

			(PMSG_IS_AUTO(msg) ? "auto-" : ""));

	if (HCD_DEAD(hcd)) {

		dev_dbg(&rhdev->dev, "skipped %s of dead bus\n", "resume");

		return 0;

drivers/usb/core/hub.c

+3 −4
Original line number Diff line number Diff line
@@ -2324,8 +2324,6 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) 
	int		port1 = udev->portnum;

	int		status;



	// dev_dbg(hub->intfdev, "suspend port %d\n", port1);



	/* enable remote wakeup when appropriate; this lets the device

	 * wake up the upstream hub (including maybe the root hub).

	 *
@@ -2371,8 +2369,9 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) 
			status = 0;

	} else {

		/* device has up to 10 msec to fully suspend */

		dev_dbg(&udev->dev, "usb %ssuspend\n",

				(PMSG_IS_AUTO(msg) ? "auto-" : ""));

		dev_dbg(&udev->dev, "usb %ssuspend, wakeup %d\n",

				(PMSG_IS_AUTO(msg) ? "auto-" : ""),

				udev->do_remote_wakeup);

		usb_set_device_state(udev, USB_STATE_SUSPENDED);

		msleep(10);

	}