Commit e4ceb0f4 authored by Bing Zhao's avatar Bing Zhao Committed by John W. Linville

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: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 10761822
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
#define USB_VERSION "1.0" #define USB_VERSION "1.0"
static const char usbdriver_name[] = "usb8xxx";
static struct mwifiex_if_ops usb_ops; static struct mwifiex_if_ops usb_ops;
static struct semaphore add_remove_card_sem; static struct semaphore add_remove_card_sem;
static struct usb_card_rec *usb_card; static struct usb_card_rec *usb_card;
...@@ -567,7 +565,7 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf) ...@@ -567,7 +565,7 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf)
} }
static struct usb_driver mwifiex_usb_driver = { static struct usb_driver mwifiex_usb_driver = {
.name = usbdriver_name, .name = "mwifiex_usb",
.probe = mwifiex_usb_probe, .probe = mwifiex_usb_probe,
.disconnect = mwifiex_usb_disconnect, .disconnect = mwifiex_usb_disconnect,
.id_table = mwifiex_usb_table, .id_table = mwifiex_usb_table,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment