diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-16 11:39:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-16 11:39:56 -0400 |
commit | 0b623f871d7c993fac8ad7aaaa8f5f3cdb8ed480 (patch) | |
tree | b1b5e71b0858aeff901a52c27bbc23abc9fbc3f2 /drivers/usb/serial | |
parent | dcd82cd1c249fb85bad3da5d2a07a116cd65a22b (diff) |
Revert "USB: serial: sierra: put reset_resume callback back."
This reverts commit 6971113e1000d24f7d4975eaa6f8cf2739a4565b.
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: Alan 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/sierra.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 90b985df681b..ba54a0a8235c 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
@@ -1039,16 +1039,9 @@ static int sierra_resume(struct usb_serial *serial) | |||
1039 | return ec ? -EIO : 0; | 1039 | return ec ? -EIO : 0; |
1040 | } | 1040 | } |
1041 | 1041 | ||
1042 | static int sierra_reset_resume(struct usb_serial *serial) | ||
1043 | { | ||
1044 | dev_err(&serial->dev->dev, "%s\n", __func__); | ||
1045 | return usb_serial_resume(serial->interface); | ||
1046 | } | ||
1047 | |||
1048 | #else | 1042 | #else |
1049 | #define sierra_suspend NULL | 1043 | #define sierra_suspend NULL |
1050 | #define sierra_resume NULL | 1044 | #define sierra_resume NULL |
1051 | #define sierra_reset_resume NULL | ||
1052 | #endif | 1045 | #endif |
1053 | 1046 | ||
1054 | static struct usb_serial_driver sierra_device = { | 1047 | static struct usb_serial_driver sierra_device = { |
@@ -1072,7 +1065,6 @@ static struct usb_serial_driver sierra_device = { | |||
1072 | .release = sierra_release, | 1065 | .release = sierra_release, |
1073 | .suspend = sierra_suspend, | 1066 | .suspend = sierra_suspend, |
1074 | .resume = sierra_resume, | 1067 | .resume = sierra_resume, |
1075 | .reset_resume = sierra_reset_resume, | ||
1076 | .read_int_callback = sierra_instat_callback, | 1068 | .read_int_callback = sierra_instat_callback, |
1077 | }; | 1069 | }; |
1078 | 1070 | ||