Commit 076e7779 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 116a0fc3 66f2c99a

drivers/bluetooth/ath3k.c

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x13d3, 0x3375) },

	{ USB_DEVICE(0x04CA, 0x3005) },

	{ USB_DEVICE(0x13d3, 0x3362) },

	{ USB_DEVICE(0x0CF3, 0xE004) },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xE02C) },
@@ -94,6 +96,8 @@ static struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },



	{ }	/* Terminating entry */

};

drivers/bluetooth/btusb.c

+6 −0
Original line number Diff line number Diff line
@@ -101,12 +101,16 @@ static struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0c10, 0x0000) },



	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x0a5c, 0x21e3) },

	{ USB_DEVICE(0x0a5c, 0x21e6) },

	{ USB_DEVICE(0x0a5c, 0x21e8) },

	{ USB_DEVICE(0x0a5c, 0x21f3) },

	{ USB_DEVICE(0x413c, 0x8197) },



	/* Foxconn - Hon Hai */

	{ USB_DEVICE(0x0489, 0xe033) },



	{ }	/* Terminating entry */

};
@@ -133,6 +137,8 @@ static struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 },



	/* Atheros AR5BBU12 with sflash firmware */

	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },

drivers/net/wireless/ath/ath5k/ahb.c

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ static int ath_ahb_remove(struct platform_device *pdev) 
	}



	ath5k_deinit_ah(ah);

	iounmap(ah->iobase);

	platform_set_drvdata(pdev, NULL);

	ieee80211_free_hw(hw);

drivers/net/wireless/b43/main.c

+8 −2
Original line number Diff line number Diff line
@@ -4827,7 +4827,13 @@ static int b43_op_start(struct ieee80211_hw *hw) 
 out_mutex_unlock:

	mutex_unlock(&wl->mutex);



	/* reload configuration */

	/*

	 * Configuration may have been overwritten during initialization.

	 * Reload the configuration, but only if initialization was

	 * successful. Reloading the configuration after a failed init

	 * may hang the system.

	 */

	if (!err)

		b43_op_config(hw, ~0);



	return err;

drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+7 −1
Original line number Diff line number Diff line
@@ -108,9 +108,15 @@ static inline int brcmf_sdioh_f0_write_byte(struct brcmf_sdio_dev *sdiodev, 
			sdio_release_host(sdfunc);

		}

	} else if (regaddr == SDIO_CCCR_ABORT) {

		sdfunc = kmemdup(sdiodev->func[0], sizeof(struct sdio_func),

				 GFP_KERNEL);

		if (!sdfunc)

			return -ENOMEM;

		sdfunc->num = 0;

		sdio_claim_host(sdfunc);

		sdio_writeb(sdfunc, *byte, regaddr, &err_ret);

		sdio_release_host(sdfunc);

		kfree(sdfunc);

	} else if (regaddr < 0xF0) {

		brcmf_dbg(ERROR, "F0 Wr:0x%02x: write disallowed\n", regaddr);

		err_ret = -EPERM;
@@ -486,7 +492,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
			kfree(bus_if);

			return -ENOMEM;

		}

		sdiodev->func[0] = func->card->sdio_func[0];

		sdiodev->func[0] = func;

		sdiodev->func[1] = func;

		sdiodev->bus_if = bus_if;

		bus_if->bus_priv.sdio = sdiodev;