Commit 57f784fe authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

parents b877f4cf cd17decb

drivers/bluetooth/bcm203x.c

+1 −7
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
	if (intf->cur_altsetting->desc.bInterfaceNumber != 0)

		return -ENODEV;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);

	if (!data) {

		BT_ERR("Can't allocate memory for data structure");

		return -ENOMEM;
@@ -189,14 +189,12 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
	data->urb = usb_alloc_urb(0, GFP_KERNEL);

	if (!data->urb) {

		BT_ERR("Can't allocate URB");

		kfree(data);

		return -ENOMEM;

	}



	if (request_firmware(&firmware, "BCM2033-MD.hex", &udev->dev) < 0) {

		BT_ERR("Mini driver request failed");

		usb_free_urb(data->urb);

		kfree(data);

		return -EIO;

	}
@@ -209,7 +207,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		BT_ERR("Can't allocate memory for mini driver");

		release_firmware(firmware);

		usb_free_urb(data->urb);

		kfree(data);

		return -ENOMEM;

	}
@@ -224,7 +221,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		BT_ERR("Firmware request failed");

		usb_free_urb(data->urb);

		kfree(data->buffer);

		kfree(data);

		return -EIO;

	}
@@ -236,7 +232,6 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		release_firmware(firmware);

		usb_free_urb(data->urb);

		kfree(data->buffer);

		kfree(data);

		return -ENOMEM;

	}
@@ -271,7 +266,6 @@ static void bcm203x_disconnect(struct usb_interface *intf) 
	usb_free_urb(data->urb);

	kfree(data->fw_data);

	kfree(data->buffer);

	kfree(data);

}



static struct usb_driver bcm203x_driver = {

drivers/bluetooth/bfusb.c

+4 −8
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	}



	/* Initialize control structure and load firmware */

	data = kzalloc(sizeof(struct bfusb_data), GFP_KERNEL);

	data = devm_kzalloc(&intf->dev, sizeof(struct bfusb_data), GFP_KERNEL);

	if (!data) {

		BT_ERR("Can't allocate memory for control structure");

		goto done;
@@ -674,7 +674,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 


	if (request_firmware(&firmware, "bfubase.frm", &udev->dev) < 0) {

		BT_ERR("Firmware request failed");

		goto error;

		goto done;

	}



	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
@@ -690,7 +690,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	hdev = hci_alloc_dev();

	if (!hdev) {

		BT_ERR("Can't allocate HCI device");

		goto error;

		goto done;

	}



	data->hdev = hdev;
@@ -708,7 +708,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
	if (hci_register_dev(hdev) < 0) {

		BT_ERR("Can't register HCI device");

		hci_free_dev(hdev);

		goto error;

		goto done;

	}



	usb_set_intfdata(intf, data);
@@ -718,9 +718,6 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
release:

	release_firmware(firmware);



error:

	kfree(data);



done:

	return -EIO;

}
@@ -741,7 +738,6 @@ static void bfusb_disconnect(struct usb_interface *intf) 


	hci_unregister_dev(hdev);

	hci_free_dev(hdev);

	kfree(data);

}



static struct usb_driver bfusb_driver = {

drivers/bluetooth/bluecard_cs.c

+1 −4
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int bluecard_probe(struct pcmcia_device *link) 
	bluecard_info_t *info;



	/* Create new info device */

	info = kzalloc(sizeof(*info), GFP_KERNEL);

	info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;
@@ -864,10 +864,7 @@ static int bluecard_probe(struct pcmcia_device *link) 


static void bluecard_detach(struct pcmcia_device *link)

{

	bluecard_info_t *info = link->priv;



	bluecard_release(link);

	kfree(info);

}

drivers/bluetooth/bpa10x.c

+2 −6
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * 
	if (intf->cur_altsetting->desc.bInterfaceNumber != 0)

		return -ENODEV;



	data = kzalloc(sizeof(*data), GFP_KERNEL);

	data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;
@@ -453,10 +453,8 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * 
	init_usb_anchor(&data->rx_anchor);



	hdev = hci_alloc_dev();

	if (!hdev) {

		kfree(data);

	if (!hdev)

		return -ENOMEM;

	}



	hdev->bus = HCI_USB;

	hci_set_drvdata(hdev, data);
@@ -475,7 +473,6 @@ static int bpa10x_probe(struct usb_interface *intf, const struct usb_device_id * 
	err = hci_register_dev(hdev);

	if (err < 0) {

		hci_free_dev(hdev);

		kfree(data);

		return err;

	}
@@ -500,7 +497,6 @@ static void bpa10x_disconnect(struct usb_interface *intf) 
	hci_free_dev(data->hdev);

	kfree_skb(data->rx_skb[0]);

	kfree_skb(data->rx_skb[1]);

	kfree(data);

}



static struct usb_driver bpa10x_driver = {

drivers/bluetooth/bt3c_cs.c

+1 −4
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ static int bt3c_probe(struct pcmcia_device *link) 
	bt3c_info_t *info;



	/* Create new info device */

	info = kzalloc(sizeof(*info), GFP_KERNEL);

	info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;
@@ -654,10 +654,7 @@ static int bt3c_probe(struct pcmcia_device *link) 


static void bt3c_detach(struct pcmcia_device *link)

{

	bt3c_info_t *info = link->priv;



	bt3c_release(link);

	kfree(info);

}



static int bt3c_check_config(struct pcmcia_device *p_dev, void *priv_data)