Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22097fd2 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 1a67a573 54d5026e

drivers/bluetooth/ath3k.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int ath3k_load_firmware(struct usb_device *udev, 


	pipe = usb_sndctrlpipe(udev, 0);



	send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC);

	send_buf = kmalloc(BULK_SIZE, GFP_KERNEL);

	if (!send_buf) {

		BT_ERR("Can't allocate memory chunk for firmware");

		return -ENOMEM;
@@ -176,7 +176,7 @@ static int ath3k_load_fwfile(struct usb_device *udev, 


	count = firmware->size;



	send_buf = kmalloc(BULK_SIZE, GFP_ATOMIC);

	send_buf = kmalloc(BULK_SIZE, GFP_KERNEL);

	if (!send_buf) {

		BT_ERR("Can't allocate memory chunk for firmware");

		return -ENOMEM;

drivers/bluetooth/bcm203x.c

+11 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#include <linux/module.h>



#include <linux/atomic.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/slab.h>
@@ -65,6 +66,7 @@ struct bcm203x_data { 
	unsigned long		state;



	struct work_struct	work;

	atomic_t		shutdown;



	struct urb		*urb;

	unsigned char		*buffer;
@@ -97,6 +99,7 @@ static void bcm203x_complete(struct urb *urb) 


		data->state = BCM203X_SELECT_MEMORY;



		/* use workqueue to have a small delay */

		schedule_work(&data->work);

		break;
@@ -155,7 +158,10 @@ static void bcm203x_work(struct work_struct *work) 
	struct bcm203x_data *data =

		container_of(work, struct bcm203x_data, work);



	if (usb_submit_urb(data->urb, GFP_ATOMIC) < 0)

	if (atomic_read(&data->shutdown))

		return;



	if (usb_submit_urb(data->urb, GFP_KERNEL) < 0)

		BT_ERR("Can't submit URB");

}
@@ -243,6 +249,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 


	usb_set_intfdata(intf, data);



	/* use workqueue to have a small delay */

	schedule_work(&data->work);



	return 0;
@@ -254,6 +261,9 @@ static void bcm203x_disconnect(struct usb_interface *intf) 


	BT_DBG("intf %p", intf);



	atomic_inc(&data->shutdown);

	cancel_work_sync(&data->work);



	usb_kill_urb(data->urb);



	usb_set_intfdata(intf, NULL);

drivers/bluetooth/bfusb.c

+7 −6
Original line number Diff line number Diff line
@@ -568,22 +568,23 @@ static int bfusb_load_firmware(struct bfusb_data *data, 


	BT_INFO("BlueFRITZ! USB loading firmware");



	buf = kmalloc(BFUSB_MAX_BLOCK_SIZE + 3, GFP_KERNEL);

	if (!buf) {

		BT_ERR("Can't allocate memory chunk for firmware");

		return -ENOMEM;

	}



	pipe = usb_sndctrlpipe(data->udev, 0);



	if (usb_control_msg(data->udev, pipe, USB_REQ_SET_CONFIGURATION,

				0, 1, 0, NULL, 0, USB_CTRL_SET_TIMEOUT) < 0) {

		BT_ERR("Can't change to loading configuration");

		kfree(buf);

		return -EBUSY;

	}



	data->udev->toggle[0] = data->udev->toggle[1] = 0;



	buf = kmalloc(BFUSB_MAX_BLOCK_SIZE + 3, GFP_ATOMIC);

	if (!buf) {

		BT_ERR("Can't allocate memory chunk for firmware");

		return -ENOMEM;

	}



	pipe = usb_sndbulkpipe(data->udev, data->bulk_out_ep);



	while (count) {

drivers/net/wireless/ath/ath9k/ar9002_calib.c

+0 −4
Original line number Diff line number Diff line
@@ -868,10 +868,6 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan) 
	/* Do PA Calibration */

	ar9002_hw_pa_cal(ah, true);



	/* Do NF Calibration after DC offset and other calibrations */

	ath9k_hw_loadnf(ah, chan);

	ath9k_hw_start_nfcal(ah, true);



	if (ah->caldata)

		ah->caldata->nfcal_pending = true;

drivers/net/wireless/ath/ath9k/ar9003_calib.c

+6 −5
Original line number Diff line number Diff line
@@ -908,12 +908,15 @@ static bool ar9003_hw_rtt_restore(struct ath_hw *ah, struct ath9k_channel *chan) 
	int i;

	bool restore;



	if (!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT) || !ah->caldata)

	if (!ah->caldata)

		return false;



	hist = &ah->caldata->rtt_hist;

	if (!hist->num_readings)

		return false;



	ar9003_hw_rtt_enable(ah);

	ar9003_hw_rtt_set_mask(ah, 0x10);

	ar9003_hw_rtt_set_mask(ah, 0x00);

	for (i = 0; i < AR9300_MAX_CHAINS; i++) {

		if (!(ah->rxchainmask & (1 << i)))

			continue;
@@ -1070,6 +1073,7 @@ skip_tx_iqcal: 
		if (is_reusable && (hist->num_readings < RTT_HIST_MAX)) {

			u32 *table;



			hist->num_readings++;

			for (i = 0; i < AR9300_MAX_CHAINS; i++) {

				if (!(ah->rxchainmask & (1 << i)))

					continue;
@@ -1081,9 +1085,6 @@ skip_tx_iqcal: 
		ar9003_hw_rtt_disable(ah);

	}



	ath9k_hw_loadnf(ah, chan);

	ath9k_hw_start_nfcal(ah, true);



	/* Initialize list pointers */

	ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;

	ah->supp_cals = IQ_MISMATCH_CAL;