mwifiex: fix regression issue for usb interface
authorAmitkumar Karwar <akarwar@marvell.com>
Tue, 4 Jun 2013 23:19:56 +0000 (16:19 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 18:59:38 +0000 (14:59 -0400)
commitdf8100836e05b457af7b1627c601afe82e1d3ebe
tree10fa5f4f1b1c6afc2ef9a44c785e708718ba67d4
parent705802bf56b1b7a64e543805ba196a6e1fb80ec6
mwifiex: fix regression issue for usb interface

PATCH "mwifiex: scan delay timer cleanup in unload path" adds code
to cancel scan delay timer in unload path. It causes a regression
for USB interface.

USB8797 card gets enumerated twice. First enumeration is for
firmware download and second enumeration expects firmware
initialization.

It was observed that we are trying del_timer_sync() without setting
up the timer when remove handler is called after first enumeration.

This patch moves setup_timer() call to appropriate place so that
timer is setup for both the enumerations.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/mwifiex/init.c
drivers/net/wireless/mwifiex/main.c