diff options
| author | Christian Lamparter <chunkeey@googlemail.com> | 2010-08-22 22:41:33 +0200 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-01-06 18:08:23 -0500 |
| commit | cf6df87124f97947c1d6a61fec37ce07d086f740 (patch) | |
| tree | cb471cbb81ac45b98eb0f71f4ee9f28641e0e3ef | |
| parent | 60534386c08a9bea1049415f88b8c976d27d5be0 (diff) | |
| download | linux-stable-cf6df87124f97947c1d6a61fec37ce07d086f740.tar.gz | |
p54usb: fix off-by-one on !CONFIG_PM
commit 11791a6f7534906b4a01ffb54ba0b02ca39398ef upstream.
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.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -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 186dc71f3c55..602498a89ce3 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -931,8 +931,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); |