diff --git a/[refs] b/[refs] index 2ad358628e2a..72aa4b0d0b80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7186364e46c3800635c283924bf25433d0a556a2 +refs/heads/master: 622b80cf6a6148bedbd8fec3945327cbf9f2caf4 diff --git a/trunk/drivers/usb/serial/ch341.c b/trunk/drivers/usb/serial/ch341.c index a2b7ea726bfb..948138539378 100644 --- a/trunk/drivers/usb/serial/ch341.c +++ b/trunk/drivers/usb/serial/ch341.c @@ -577,7 +577,7 @@ static int ch341_tiocmget(struct tty_struct *tty) return result; } -static int ch341_resume(struct usb_serial *serial) +static int ch341_reset_resume(struct usb_serial *serial) { struct ch341_private *priv; @@ -607,7 +607,7 @@ static struct usb_serial_driver ch341_device = { .tiocmset = ch341_tiocmset, .read_int_callback = ch341_read_int_callback, .attach = ch341_attach, - .resume = ch341_resume, + .resume = ch341_reset_resume, }; static struct usb_serial_driver * const serial_drivers[] = {