aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/sierra.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-15 18:43:19 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-15 18:43:19 -0400
commit6971113e1000d24f7d4975eaa6f8cf2739a4565b (patch)
tree6dc78a824a209ef615d97778c7a9a0e31c0d2883 /drivers/usb/serial/sierra.c
parent622b80cf6a6148bedbd8fec3945327cbf9f2caf4 (diff)
USB: serial: sierra: put reset_resume callback back.
A few patches ago, I removed the reset_resume callback in this driver. 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: 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/sierra.c')
-rw-r--r--drivers/usb/serial/sierra.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index ba54a0a8235c..90b985df681b 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -1039,9 +1039,16 @@ static int sierra_resume(struct usb_serial *serial)
1039 return ec ? -EIO : 0; 1039 return ec ? -EIO : 0;
1040} 1040}
1041 1041
1042static 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
1042#else 1048#else
1043#define sierra_suspend NULL 1049#define sierra_suspend NULL
1044#define sierra_resume NULL 1050#define sierra_resume NULL
1051#define sierra_reset_resume NULL
1045#endif 1052#endif
1046 1053
1047static struct usb_serial_driver sierra_device = { 1054static struct usb_serial_driver sierra_device = {
@@ -1065,6 +1072,7 @@ static struct usb_serial_driver sierra_device = {
1065 .release = sierra_release, 1072 .release = sierra_release,
1066 .suspend = sierra_suspend, 1073 .suspend = sierra_suspend,
1067 .resume = sierra_resume, 1074 .resume = sierra_resume,
1075 .reset_resume = sierra_reset_resume,
1068 .read_int_callback = sierra_instat_callback, 1076 .read_int_callback = sierra_instat_callback,
1069}; 1077};
1070 1078