diff --git a/[refs] b/[refs] index 23539babb2d3..ec542c4d42ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bfd1c96a9fb9b547db9a2ad8428dc8de5526e92 +refs/heads/master: 3abee859c13ec6a0f49a7234eef011f5d45136f1 diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c index 11be3c6c958c..1040f9d50451 100644 --- a/trunk/drivers/usb/serial/sierra.c +++ b/trunk/drivers/usb/serial/sierra.c @@ -1039,21 +1039,13 @@ static int sierra_resume(struct usb_serial *serial) return ec ? -EIO : 0; } -static int sierra_reset_resume(struct usb_interface *intf) -{ - struct usb_serial *serial = usb_get_intfdata(intf); - dev_err(&serial->dev->dev, "%s\n", __func__); - return usb_serial_resume(intf); -} #else #define sierra_suspend NULL #define sierra_resume NULL -#define sierra_reset_resume NULL #endif static struct usb_driver sierra_driver = { .name = "sierra", - .reset_resume = sierra_reset_resume, .id_table = id_table, };