Skip to content

Commit

Permalink
mwifiex: rename usb driver name registerring to usb core
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bing Zhao authored and John W. Linville committed Feb 24, 2014
1 parent 1076182 commit e4ceb0f
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/net/wireless/mwifiex/usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit e4ceb0f

Please sign in to comment.