aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb/serial/sierra.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-15 15:43:19 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-15 15:43:19 -0700
commit6971113e1000d24f7d4975eaa6f8cf2739a4565b (patch)
tree6dc78a824a209ef615d97778c7a9a0e31c0d2883 /drivers/usb/serial/sierra.c
parent622b80cf6a6148bedbd8fec3945327cbf9f2caf4 (diff)
downloadlinux-stericsson-6971113e1000d24f7d4975eaa6f8cf2739a4565b.tar.gz
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)
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
#define sierra_suspend NULL
#define sierra_resume NULL
+#define sierra_reset_resume NULL
#endif
static struct usb_serial_driver sierra_device = {
@@ -1065,6 +1072,7 @@ static struct usb_serial_driver sierra_device = {
.release = sierra_release,
.suspend = sierra_suspend,
.resume = sierra_resume,
+ .reset_resume = sierra_reset_resume,
.read_int_callback = sierra_instat_callback,
};