Stir driver suspend fix
PATCH 1/1 Stir driver suspend fix
irXXX_stir_suspend.diff :
~~~~~~~~~~~~~~~~~~~~~~~
<Patch from Stephen Hemminger>
o [FEATURE] stir4200: don't need suspend/resume if !CONFIG_PM
The suspend/resume code only needs to be compiled in if power management is enabled.
Signed-off-by Stephen Hemminger <[email protected]>
Signed-off-by Jean Tourrilhes <[email protected]>
drivers/net/irda/stir4200.c +7 -2
@@ -761,8 +761,9 @@ && netif_device_present(dev) && !signal_pending(current)) { +#ifdef CONFIG_PM /* if suspending, then power off and wait */ -if (current->flags &PF_FREEZE ) { +if (unlikely (current->flags &PF_FREEZE )) {if (stir->receiving)receive_stop (stir);else
@@ -775,6 +776,7 @@if (change_speed (stir, stir->speed)) break; } +#endif /* if something to send? */ skb =xchg (&stir->tx_pending,NULL );
@@ -1125,7 +1127,7 @@usb_set_intfdata (intf,NULL ); } - +#ifdef CONFIG_PM /* Power management suspend, so power off the transmitter/receiver */ static int stir_suspend (struct usb_interface *intf,u32 state) {
@@ -1145,6 +1147,7 @@/* receiver restarted when send thread wakes up */ return 0; } +#endif /* * USB device callbacks
@@ -1155,8 +1158,10 @@ .probe = stir_probe, .disconnect = stir_disconnect, .id_table = dongles, +#ifdef CONFIG_PM .suspend = stir_suspend, .resume = stir_resume, +#endif };/*