From 622b80cf6a6148bedbd8fec3945327cbf9f2caf4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 15 May 2012 15:41:47 -0700 Subject: [PATCH] USB: serial: ch341: put reset_resume callback back. A few patches ago, I removed the reset_resume callback, changing it to resume instead. Now that the usb-serial core supports reset_resume, put this driver callback back as well, so it should work identically to how it was originally. Now if this function really is doing what it should be doing, well, that's a different story, but we are at least doing the identical thing that we were before... Cc: Johan Hovold Cc: Alan Stern Cc: Rusty Russell Cc: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/usb/serial/ch341.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index a2b7ea726bfb..948138539378 100644 --- a/drivers/usb/serial/ch341.c +++ b/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[] = { -- 2.39.2