openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cdc-acm: fix power management in ioctl 

An ioctl that does depends on communication with a device should
prevent suspension of teh device.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum 2013-11-20 11:35:36 +01:00 committed by Greg Kroah-Hartman
parent 797ef13716
commit 8fdbeb26b5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -888,7 +888,13 @@ static int acm_tty_ioctl(struct tty_struct *tty,
rv = set_serial_info(acm, (struct serial_struct __user *) arg); rv = set_serial_info(acm, (struct serial_struct __user *) arg);
break; break;
case TIOCMIWAIT: case TIOCMIWAIT:
rv = usb_autopm_get_interface(acm->control);
if (rv < 0) {
rv = -EIO;
break;
}
rv = wait_serial_change(acm, arg); rv = wait_serial_change(acm, arg);
usb_autopm_put_interface(acm->control);
break; break;
case TIOCGICOUNT: case TIOCGICOUNT:
rv = get_serial_usage(acm, (struct serial_icounter_struct __user *) arg); rv = get_serial_usage(acm, (struct serial_icounter_struct __user *) arg);