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

Commit bae3f4c5 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: cdc-acm: fix runtime PM for control messages 



Fix runtime PM handling of control messages by adding the required PM
counter operations.

Fixes: 11ea859d ("USB: additional power savings for cdc-acm devices
that support remote wakeup")

Cc: <stable@vger.kernel.org>	# v2.6.27
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 140cb81a

drivers/usb/class/cdc-acm.c

+11 −1
Original line number Diff line number Diff line
@@ -122,13 +122,23 @@ static void acm_release_minor(struct acm *acm) 
static int acm_ctrl_msg(struct acm *acm, int request, int value,

							void *buf, int len)

{

	int retval = usb_control_msg(acm->dev, usb_sndctrlpipe(acm->dev, 0),

	int retval;



	retval = usb_autopm_get_interface(acm->control);

	if (retval)

		return retval;



	retval = usb_control_msg(acm->dev, usb_sndctrlpipe(acm->dev, 0),

		request, USB_RT_ACM, value,

		acm->control->altsetting[0].desc.bInterfaceNumber,

		buf, len, 5000);



	dev_dbg(&acm->control->dev,

			"%s - rq 0x%02x, val %#x, len %#x, result %d\n",

			__func__, request, value, len, retval);



	usb_autopm_put_interface(acm->control);



	return retval < 0 ? retval : 0;

}