diff -Nru a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c --- a/drivers/net/irda/stir4200.c 2004-10-08 14:01:57 -07:00 +++ b/drivers/net/irda/stir4200.c 2004-10-08 14:01:57 -07:00 @@ -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 }; /*