lkml.org 
[lkml]   [2010]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[29/66] p54usb: fix off-by-one on !CONFIG_PM
    2.6.36-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Christian Lamparter <chunkeey@googlemail.com>

    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: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/p54/p54usb.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/net/wireless/p54/p54usb.c
    +++ b/drivers/net/wireless/p54/p54usb.c
    @@ -930,8 +930,8 @@ static int __devinit p54u_probe(struct u
    #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);



    \
     
     \ /
      Last update: 2010-11-19 23:17    [W:0.020 / U:0.192 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site