[OLPC-devel] [PATCH] wireless/libertas: respect CONFIG_PM

Dan Williams dcbw at redhat.com
Thu Jun 29 12:04:36 EDT 2006


Bound suspend/resume stuff with CONFIG_PM like zd1201 driver.

Signed-off-by: Dan Williams <dcbw at redhat.com>

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 15e4e96..13ebf27 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -73,8 +73,13 @@ static void if_usb_receive_fwload(struct
 static int if_usb_probe(struct usb_interface *intf,
 			const struct usb_device_id *id);
 static void if_usb_disconnect(struct usb_interface *intf);
+#ifdef CONFIG_PM
 static int if_usb_suspend(struct usb_interface *intf, pm_message_t message);
 static int if_usb_resume(struct usb_interface *intf);
+#else
+#define if_usb_suspend NULL
+#define if_usb_resume NULL
+#endif
 
 static int __if_usb_submit_rx_urb(wlan_private * priv,
 				  void (*callbackfn)
@@ -1051,6 +1054,7 @@ inline int sbi_resume(wlan_private * pri
 }
 #endif
 
+#ifdef CONFIG_PM
 static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
 {
 	struct usb_card_rec *cardp = usb_get_intfdata(intf);
@@ -1088,3 +1092,4 @@ static int if_usb_resume(struct usb_inte
 	LEAVE();
 	return 0;
 }
+#endif





More information about the Devel mailing list