Commit 25ea0dd9 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville

b43: drop ssb-duplicated workaround for dangling cores

Remove the code to detect inactive 802.11 cores, as that function is now done
in ssb.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9a24af11
...@@ -4836,25 +4836,8 @@ static void b43_one_core_detach(struct ssb_device *dev) ...@@ -4836,25 +4836,8 @@ static void b43_one_core_detach(struct ssb_device *dev)
static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl) static int b43_one_core_attach(struct ssb_device *dev, struct b43_wl *wl)
{ {
struct b43_wldev *wldev; struct b43_wldev *wldev;
struct pci_dev *pdev;
int err = -ENOMEM; int err = -ENOMEM;
if (!list_empty(&wl->devlist)) {
/* We are not the first core on this chip. */
pdev = (dev->bus->bustype == SSB_BUSTYPE_PCI) ? dev->bus->host_pci : NULL;
/* Only special chips support more than one wireless
* core, although some of the other chips have more than
* one wireless core as well. Check for this and
* bail out early.
*/
if (!pdev ||
((pdev->device != 0x4321) &&
(pdev->device != 0x4313) && (pdev->device != 0x431A))) {
b43dbg(wl, "Ignoring unconnected 802.11 core\n");
return -ENODEV;
}
}
wldev = kzalloc(sizeof(*wldev), GFP_KERNEL); wldev = kzalloc(sizeof(*wldev), GFP_KERNEL);
if (!wldev) if (!wldev)
goto out; goto out;
......
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