diff --git a/[refs] b/[refs] index 72aa4b0d0b80..f81bc2dc3f80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 622b80cf6a6148bedbd8fec3945327cbf9f2caf4 +refs/heads/master: 6971113e1000d24f7d4975eaa6f8cf2739a4565b diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c index ba54a0a8235c..90b985df681b 100644 --- a/trunk/drivers/usb/serial/sierra.c +++ b/trunk/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, };