OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: fix build error in cdc-acm for CONFIG_PM=n 

Here's the fix. cdc-wdm has the same problem. The fix is the same.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum 2008-07-01 19:10:08 +02:00 committed by Greg Kroah-Hartman
parent 95f371f24c
commit 357585892e
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/class/cdc-acm.c
View File

@ -1255,6 +1255,7 @@ static void acm_disconnect(struct usb_interface *intf)
tty_hangup(acm->tty); tty_hangup(acm->tty);
} }
#ifdef CONFIG_PM
static int acm_suspend(struct usb_interface *intf, pm_message_t message) static int acm_suspend(struct usb_interface *intf, pm_message_t message)
{ {
struct acm *acm = usb_get_intfdata(intf); struct acm *acm = usb_get_intfdata(intf);
@ -1320,6 +1321,8 @@ err_out:
mutex_unlock(&acm->mutex); mutex_unlock(&acm->mutex);
return rv; return rv;
} }
#endif /* CONFIG_PM */
/* /*
* USB driver structure. * USB driver structure.
*/ */
@ -1375,10 +1378,14 @@ static struct usb_driver acm_driver = {
.name = "cdc_acm", .name = "cdc_acm",
.probe = acm_probe, .probe = acm_probe,
.disconnect = acm_disconnect, .disconnect = acm_disconnect,
#ifdef CONFIG_PM
.suspend = acm_suspend, .suspend = acm_suspend,
.resume = acm_resume, .resume = acm_resume,
#endif
.id_table = acm_ids, .id_table = acm_ids,
#ifdef CONFIG_PM
.supports_autosuspend = 1, .supports_autosuspend = 1,
#endif
}; };
/* /*

4
drivers/usb/class/cdc-wdm.c
View File

@ -750,12 +750,16 @@ static int wdm_suspend(struct usb_interface *intf, pm_message_t message)
dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor); dev_dbg(&desc->intf->dev, "wdm%d_suspend\n", intf->minor);
mutex_lock(&desc->plock); mutex_lock(&desc->plock);
#ifdef CONFIG_PM
if (interface_to_usbdev(desc->intf)->auto_pm && test_bit(WDM_IN_USE, &desc->flags)) { if (interface_to_usbdev(desc->intf)->auto_pm && test_bit(WDM_IN_USE, &desc->flags)) {
rv = -EBUSY; rv = -EBUSY;
} else { } else {
#endif
cancel_work_sync(&desc->rxwork); cancel_work_sync(&desc->rxwork);
kill_urbs(desc); kill_urbs(desc);
#ifdef CONFIG_PM
} }
#endif
mutex_unlock(&desc->plock); mutex_unlock(&desc->plock);
return rv; return rv;