diff options
| author | Christian Lamparter | 2010-08-22 22:41:33 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-08-25 20:33:20 +0200 |
| commit | 11791a6f7534906b4a01ffb54ba0b02ca39398ef (patch) | |
| tree | ffda98258e1494287e0d2c29b55c2c71735d0e5f /drivers/net/wireless/p54 | |
| parent | b43: N-PHY: add missing phyrxchain setting and fix warning in RX core function (diff) | |
| download | kernel-qcow2-linux-11791a6f7534906b4a01ffb54ba0b02ca39398ef.tar.gz kernel-qcow2-linux-11791a6f7534906b4a01ffb54ba0b02ca39398ef.tar.xz kernel-qcow2-linux-11791a6f7534906b4a01ffb54ba0b02ca39398ef.zip | |
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 Add support for the ARM, AHB, APB and DDR clocks found on the
WM8505, WM8650, WM8750 and WM8850 SoCs.
These clocks are gateable, but the enable part of the clock definition
is left out as there are no users for these clocks, and we don't want
them being disabled at boot, but it does provide users the ability to
check the current rate of these clocks.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
-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); |