---

yaml --- r: 303855 b: refs/heads/master c: 3abee85 h: refs/heads/master i: 303853: 93f6b4f 303851: 692c500 303847: dbbbeab 303839: d93e8b6 v: v3
git-mirror · May 7, 2012 · 0b9bc59 · 0b9bc59
1 parent f1d0d06
commit 0b9bc59
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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,
 };