diff options
| author |   Bing Zhao <bzhao@marvell.com> | 2014-02-21 12:23:00 -0800 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2014-02-24 14:55:27 -0500 |
| commit | e4ceb0f40da5dc26f84025d121c2fe6ff7d8a947 (patch) | |
| tree | f3583b3e7715672532763a28224e22db1caddcfe /drivers/net/wireless/mwifiex | |
| parent | Merge tag 'nfc-fixes-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes (diff) | |
| download | linux-dev-e4ceb0f40da5dc26f84025d121c2fe6ff7d8a947.tar.xz linux-dev-e4ceb0f40da5dc26f84025d121c2fe6ff7d8a947.zip | |
mwifiex: rename usb driver name registerring to usb core
Both libertas USB driver and mwifiex_usb driver are registerring
with name 'usb8xxx'. The following conflict happens while trying
to load both drivers.
[6.211307] Error: Driver 'usb8xxx' is already registered...
[6.217261] mwifiex_usb: Driver register failed!
Fix it by renaming mwifiex_usb driver's name.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
| -rw-r--r-- | drivers/net/wireless/mwifiex/usb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c index e8ebbd4bc3cd..cb6b70a1b34d 100644 --- a/drivers/net/wireless/mwifiex/usb.c +++ b/drivers/net/wireless/mwifiex/usb.c @@ -22,8 +22,6 @@ #define USB_VERSION "1.0" -static const char usbdriver_name[] = "usb8xxx"; - static struct mwifiex_if_ops usb_ops; static struct semaphore add_remove_card_sem; static struct usb_card_rec *usb_card; @@ -567,7 +565,7 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf) } static struct usb_driver mwifiex_usb_driver = { - .name = usbdriver_name, + .name = "mwifiex_usb", .probe = mwifiex_usb_probe, .disconnect = mwifiex_usb_disconnect, .id_table = mwifiex_usb_table, |