Skip to content

Commit

Permalink
USB: serial: ch341: put reset_resume callback back.
Browse files Browse the repository at this point in the history
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 <jhovold@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 15, 2012
1 parent 7186364 commit 622b80c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/usb/serial/ch341.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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[] = {
Expand Down

0 comments on commit 622b80c

Please sign in to comment.