From: Amitkumar Karwar <akarwar@marvell.com>
Date: Tue, 4 Jun 2013 23:19:56 +0000 (-0700)
Subject: mwifiex: fix regression issue for usb interface
X-Git-Tag: v3.11-rc1~64^2~166^2^2~98
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df8100836e05b457af7b1627c601afe82e1d3ebe;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed