Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit cd6045138ed1bb5d8773e940d51c34318eef3ef2

Authored by Andrew Morton
Committed by Linus Torvalds
1 parent d68721eb33
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

drivers/usb/serial/sierra.c: fix CONFIG_PM=n build 

drivers/usb/serial/sierra.c: In function 'sierra_suspend':
drivers/usb/serial/sierra.c:936: error: 'struct usb_device' has no member named 'auto_pm'

Repairs

commit e6929a9020acbeb04d9a3ad9a88234c15be808fd
Author: Oliver Neukum <oliver@neukum.org>
Date:   Fri Sep 4 23:19:53 2009 +0200

    USB: support for autosuspend in sierra while online

Cc: Greg KH <greg@kroah.com>
Cc: Oliver Neukum <oliver@neukum.org>
Cc: Elina Pasheva <epasheva@sierrawireless.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff

drivers/usb/serial/sierra.c
Diff comments   View file @ cd60451
... ... @@ -912,6 +912,7 @@
912 912 }
913 913 }
914 914  
  915 +#ifdef CONFIG_PM
915 916 static void stop_read_write_urbs(struct usb_serial *serial)
916 917 {
917 918 int i, j;
... ... @@ -988,6 +989,10 @@
988 989  
989 990 return ec ? -EIO : 0;
990 991 }
  992 +#else
  993 +#define sierra_suspend NULL
  994 +#define sierra_resume NULL
  995 +#endif
991 996  
992 997 static struct usb_serial_driver sierra_device = {
993 998 .driver = {