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

Commit 35758589 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

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: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 95f371f2

drivers/usb/class/cdc-acm.c

+7 −0
Original line number Diff line number Diff line
@@ -1255,6 +1255,7 @@ static void acm_disconnect(struct usb_interface *intf) 
		tty_hangup(acm->tty);

}



#ifdef CONFIG_PM

static int acm_suspend(struct usb_interface *intf, pm_message_t message)

{

	struct acm *acm = usb_get_intfdata(intf);
@@ -1320,6 +1321,8 @@ err_out: 
	mutex_unlock(&acm->mutex);

	return rv;

}



#endif /* CONFIG_PM */

/*

 * USB driver structure.

 */
@@ -1375,10 +1378,14 @@ static struct usb_driver acm_driver = { 
	.name =		"cdc_acm",

	.probe =	acm_probe,

	.disconnect =	acm_disconnect,

#ifdef CONFIG_PM

	.suspend =	acm_suspend,

	.resume =	acm_resume,

#endif

	.id_table =	acm_ids,

#ifdef CONFIG_PM

	.supports_autosuspend = 1,

#endif

};



/*

drivers/usb/class/cdc-wdm.c

+4 −0
Original line number Diff line number Diff line
@@ -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);



	mutex_lock(&desc->plock);

#ifdef CONFIG_PM

	if (interface_to_usbdev(desc->intf)->auto_pm && test_bit(WDM_IN_USE, &desc->flags)) {

		rv = -EBUSY;

	} else {

#endif

		cancel_work_sync(&desc->rxwork);

		kill_urbs(desc);

#ifdef CONFIG_PM

	}

#endif

	mutex_unlock(&desc->plock);



	return rv;