diff options
| author | Christian Lamparter <chunkeey@googlemail.com> | 2010-08-23 00:41:33 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-25 22:33:20 +0400 |
| commit | 11791a6f7534906b4a01ffb54ba0b02ca39398ef (patch) | |
| tree | ffda98258e1494287e0d2c29b55c2c71735d0e5f /drivers/net/wireless/p54 | |
| parent | 049fbfeeb5c7edb260848a89af4895e3dabfa77e (diff) | |
| download | linux-11791a6f7534906b4a01ffb54ba0b02ca39398ef.tar.xz | |
p54usb: fix off-by-one on !CONFIG_PM
The ISL3887 chip needs a USB reset, whenever the
usb-frontend module "p54usb" is reloaded.
This patch fixes an off-by-one bug, if the user
is running a kernel without the CONFIG_PM option
set and for some reason (e.g.: compat-wireless)
wants to switch between different p54usb modules.
Cc: <stable@kernel.org>
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54')
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index ad595958b7df..063248b35069 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -930,8 +930,8 @@ static int __devinit p54u_probe(struct usb_interface *intf, #ifdef CONFIG_PM /* ISL3887 needs a full reset on resume */ udev->reset_resume = 1; +#endif /* CONFIG_PM */ err = p54u_device_reset(dev); -#endif priv->hw_type = P54U_3887; dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr); |