Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11791a6f authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

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: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 049fbfee

drivers/net/wireless/p54/p54usb.c

+1 −1
Original line number Diff line number Diff line
@@ -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);