Commit 0b623f87 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "USB: serial: sierra: put reset_resume callback back."

This reverts commit 6971113e.

As Alan pointed out, this really isn't needed as it doesn't handle this
properly.  Ideally this should be handled by the usb-serial core one
day.  So revert it.
Reported-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Johan Hovold <jhovold@gmail.com>
Cc: Anton Samokhvalov <pg83@yandex.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dcd82cd1
...@@ -1039,16 +1039,9 @@ static int sierra_resume(struct usb_serial *serial) ...@@ -1039,16 +1039,9 @@ static int sierra_resume(struct usb_serial *serial)
return ec ? -EIO : 0; return ec ? -EIO : 0;
} }
static int sierra_reset_resume(struct usb_serial *serial)
{
dev_err(&serial->dev->dev, "%s\n", __func__);
return usb_serial_resume(serial->interface);
}
#else #else
#define sierra_suspend NULL #define sierra_suspend NULL
#define sierra_resume NULL #define sierra_resume NULL
#define sierra_reset_resume NULL
#endif #endif
static struct usb_serial_driver sierra_device = { static struct usb_serial_driver sierra_device = {
...@@ -1072,7 +1065,6 @@ static struct usb_serial_driver sierra_device = { ...@@ -1072,7 +1065,6 @@ static struct usb_serial_driver sierra_device = {
.release = sierra_release, .release = sierra_release,
.suspend = sierra_suspend, .suspend = sierra_suspend,
.resume = sierra_resume, .resume = sierra_resume,
.reset_resume = sierra_reset_resume,
.read_int_callback = sierra_instat_callback, .read_int_callback = sierra_instat_callback,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment