Since tty_standard_install() always returns 0, the return type has changed to void. Now apply this and remove the obsolete error check.
Signed-off-by: Jaejoong Kim climbbb.kim@gmail.com --- drivers/usb/class/cdc-acm.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 27346d6..de6a27e 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -572,23 +572,15 @@ static void acm_softint(struct work_struct *work) static int acm_tty_install(struct tty_driver *driver, struct tty_struct *tty) { struct acm *acm; - int retval;
acm = acm_get_by_minor(tty->index); if (!acm) return -ENODEV;
- retval = tty_standard_install(driver, tty); - if (retval) - goto error_init_termios; - + tty_standard_install(driver, tty); tty->driver_data = acm;
return 0; - -error_init_termios: - tty_port_put(&acm->port); - return retval; }
static int acm_tty_open(struct tty_struct *tty, struct file *filp)