|
@@ -397,11 +397,13 @@ int i2400mu_probe(struct usb_interface *iface,
|
|
|
i2400m->bus_fw_name = I2400MU_FW_FILE_NAME;
|
|
|
i2400m->bus_bm_mac_addr_impaired = 0;
|
|
|
|
|
|
+#ifdef CONFIG_PM
|
|
|
iface->needs_remote_wakeup = 1; /* autosuspend (15s delay) */
|
|
|
device_init_wakeup(dev, 1);
|
|
|
usb_autopm_enable(i2400mu->usb_iface);
|
|
|
usb_dev->autosuspend_delay = 15 * HZ;
|
|
|
usb_dev->autosuspend_disabled = 0;
|
|
|
+#endif
|
|
|
|
|
|
result = i2400m_setup(i2400m, I2400M_BRI_MAC_REINIT);
|
|
|
if (result < 0) {
|
|
@@ -493,7 +495,9 @@ int i2400mu_suspend(struct usb_interface *iface, pm_message_t pm_msg)
|
|
|
int result = 0;
|
|
|
struct device *dev = &iface->dev;
|
|
|
struct i2400mu *i2400mu = usb_get_intfdata(iface);
|
|
|
+#ifdef CONFIG_PM
|
|
|
struct usb_device *usb_dev = i2400mu->usb_dev;
|
|
|
+#endif
|
|
|
struct i2400m *i2400m = &i2400mu->i2400m;
|
|
|
|
|
|
d_fnstart(3, dev, "(iface %p pm_msg %u)\n", iface, pm_msg.event);
|
|
@@ -503,11 +507,13 @@ int i2400mu_suspend(struct usb_interface *iface, pm_message_t pm_msg)
|
|
|
atomic_dec(&i2400mu->do_autopm);
|
|
|
result = i2400m_cmd_enter_powersave(i2400m);
|
|
|
atomic_inc(&i2400mu->do_autopm);
|
|
|
+#ifdef CONFIG_PM
|
|
|
if (result < 0 && usb_dev->auto_pm == 0) {
|
|
|
/* System suspend, can't fail */
|
|
|
dev_err(dev, "failed to suspend, will reset on resume\n");
|
|
|
result = 0;
|
|
|
}
|
|
|
+#endif
|
|
|
if (result < 0)
|
|
|
goto error_enter_powersave;
|
|
|
i2400mu_notification_release(i2400mu);
|