From: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Fix build bugs with 2.6.28-final plus gregkh-usb-04 patch queue
(as snapshotted 24-Dec). Files in drivers/usb/core that wouldn't
build include: hub.c, hcd.c, driver.c, sysfs.c ... looks like
the <linux/pm.h> header has breakage in 2.6.28-final, sigh.
(At least part of this wouldn't show without enabling OTG.)
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/core/hcd.c | 2 +-
drivers/usb/core/hub.c | 4 ++--
include/linux/pm.h | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -1638,7 +1638,7 @@ static void hcd_resume_work(struct work_
usb_lock_device(udev);
usb_mark_last_busy(udev);
- usb_external_resume_device(udev, PMSG_REMOTE_RESUME);
+ usb_external_resume_device(udev, PMSG_REMOTE_WAKEUP);
usb_unlock_device(udev);
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1554,7 +1554,7 @@ static int usb_configure_device_otg(stru
* (Includes HNP test device.)
*/
if (udev->bus->b_hnp_enable || udev->bus->is_b_host) {
- err = usb_port_suspend(udev);
+ err = usb_port_suspend(udev, PMSG_SUSPEND);
if (err < 0)
dev_dbg(&udev->dev, "HNP fail, %d\n", err);
}
@@ -2205,7 +2205,7 @@ static int remote_wakeup(struct usb_devi
if (udev->state == USB_STATE_SUSPENDED) {
dev_dbg(&udev->dev, "usb %sresume\n", "wakeup-");
usb_mark_last_busy(udev);
- status = usb_external_resume_device(udev, PMSG_REMOTE_RESUME);
+ status = usb_external_resume_device(udev, PMSG_REMOTE_WAKEUP);
}
return status;
}
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -291,15 +291,15 @@ struct pm_ext_ops {
#define PMSG_THAW ((struct pm_message){ .event = PM_EVENT_THAW, })
#define PMSG_RESTORE ((struct pm_message){ .event = PM_EVENT_RESTORE, })
#define PMSG_RECOVER ((struct pm_message){ .event = PM_EVENT_RECOVER, })
-#define PMSG_USER_SUSPEND ((struct pm_messge) \
+#define PMSG_USER_SUSPEND ((struct pm_message) \
{ .event = PM_EVENT_USER_SUSPEND, })
-#define PMSG_USER_RESUME ((struct pm_messge) \
+#define PMSG_USER_RESUME ((struct pm_message) \
{ .event = PM_EVENT_USER_RESUME, })
-#define PMSG_REMOTE_RESUME ((struct pm_messge) \
- { .event = PM_EVENT_REMOTE_RESUME, })
-#define PMSG_AUTO_SUSPEND ((struct pm_messge) \
+#define PMSG_REMOTE_WAKEUP ((struct pm_message) \
+ { .event = PM_EVENT_REMOTE_WAKEUP, })
+#define PMSG_AUTO_SUSPEND ((struct pm_message) \
{ .event = PM_EVENT_AUTO_SUSPEND, })
-#define PMSG_AUTO_RESUME ((struct pm_messge) \
+#define PMSG_AUTO_RESUME ((struct pm_message) \
{ .event = PM_EVENT_AUTO_RESUME, })
/**
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
