---

yaml --- r: 150180 b: refs/heads/master c: 1379257 h: refs/heads/master v: v3
git-mirror · May 6, 2009 · ae1e9e3 · ae1e9e3
1 parent 2244e25
commit ae1e9e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 928841b1538df117658ec5977bcf336c27f7747b
+refs/heads/master: 13792578c88961256dd30e3a5d3fa1ac1ec9a7e0
diff --git a/trunk/drivers/net/wireless/p54/p54usb.c b/trunk/drivers/net/wireless/p54/p54usb.c
@@ -919,9 +919,11 @@ static int __devinit p54u_probe(struct usb_interface *intf,
 	priv->common.open = p54u_open;
 	priv->common.stop = p54u_stop;
 	if (recognized_pipes < P54U_PIPE_NUMBER) {
+#ifdef CONFIG_PM
 		/* ISL3887 needs a full reset on resume */
 		udev->reset_resume = 1;
 		err = p54u_device_reset(dev);
+#endif
 
 		priv->hw_type = P54U_3887;
 		dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr);