---

yaml --- r: 303969 b: refs/heads/master c: 0b623f8 h: refs/heads/master i: 303967: db07ea6 v: v3
git-mirror · May 16, 2012 · 10bc869 · 10bc869
1 parent c0775a7
commit 10bc869
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: dcd82cd1c249fb85bad3da5d2a07a116cd65a22b
+refs/heads/master: 0b623f871d7c993fac8ad7aaaa8f5f3cdb8ed480
diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c
@@ -1039,16 +1039,9 @@ 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 = {
@@ -1072,7 +1065,6 @@ 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,
 };