Commit 2d034687 authored by Christian Lamparter's avatar Christian Lamparter Committed by Greg Kroah-Hartman

p54usb: fix off-by-one on !CONFIG_PM

commit 11791a6f 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: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a835be5b
...@@ -929,8 +929,8 @@ static int __devinit p54u_probe(struct usb_interface *intf, ...@@ -929,8 +929,8 @@ static int __devinit p54u_probe(struct usb_interface *intf,
#ifdef CONFIG_PM #ifdef CONFIG_PM
/* ISL3887 needs a full reset on resume */ /* ISL3887 needs a full reset on resume */
udev->reset_resume = 1; udev->reset_resume = 1;
#endif /* CONFIG_PM */
err = p54u_device_reset(dev); err = p54u_device_reset(dev);
#endif
priv->hw_type = P54U_3887; priv->hw_type = P54U_3887;
dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr); dev->extra_tx_headroom += sizeof(struct lm87_tx_hdr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment