* [PATCH] p54usb: fix off-by-one on !CONFIG_PM
@ 2010-08-22 20:41 Christian Lamparter
2010-08-22 21:03 ` Larry Finger
0 siblings, 1 reply; 2+ messages in thread
From: Christian Lamparter @ 2010-08-22 20:41 UTC (permalink / raw)
To: linux-wireless; +Cc: John W. Linville
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>
---
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index ad59595..063248b 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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] p54usb: fix off-by-one on !CONFIG_PM
2010-08-22 20:41 [PATCH] p54usb: fix off-by-one on !CONFIG_PM Christian Lamparter
@ 2010-08-22 21:03 ` Larry Finger
0 siblings, 0 replies; 2+ messages in thread
From: Larry Finger @ 2010-08-22 21:03 UTC (permalink / raw)
To: Christian Lamparter; +Cc: linux-wireless, John W. Linville
On 08/22/2010 03:41 PM, Christian Lamparter wrote:
> 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>
> ---
> diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
> index ad59595..063248b 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);
ACK.
Larry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-22 21:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-22 20:41 [PATCH] p54usb: fix off-by-one on !CONFIG_PM Christian Lamparter
2010-08-22 21:03 ` Larry Finger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).