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

Commit 4f8d8158 authored by Sachin Kamat's avatar Sachin Kamat Committed by Gustavo Padovan
Browse files

Bluetooth: Use devm_kzalloc in btwilink.c file 



devm_kzalloc() eliminates the need to free memory explicitly
thereby saving some cleanup code.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 98921dbd

drivers/bluetooth/btwilink.c

+2 −6
Original line number Diff line number Diff line
@@ -297,16 +297,14 @@ static int bt_ti_probe(struct platform_device *pdev) 
	struct hci_dev *hdev;

	int err;



	hst = kzalloc(sizeof(struct ti_st), GFP_KERNEL);

	hst = devm_kzalloc(&pdev->dev, sizeof(struct ti_st), GFP_KERNEL);

	if (!hst)

		return -ENOMEM;



	/* Expose "hciX" device to user space */

	hdev = hci_alloc_dev();

	if (!hdev) {

		kfree(hst);

	if (!hdev)

		return -ENOMEM;

	}



	BT_DBG("hdev %p", hdev);
@@ -321,7 +319,6 @@ static int bt_ti_probe(struct platform_device *pdev) 
	err = hci_register_dev(hdev);

	if (err < 0) {

		BT_ERR("Can't register HCI device error %d", err);

		kfree(hst);

		hci_free_dev(hdev);

		return err;

	}
@@ -347,7 +344,6 @@ static int bt_ti_remove(struct platform_device *pdev) 
	hci_unregister_dev(hdev);



	hci_free_dev(hdev);

	kfree(hst);



	dev_set_drvdata(&pdev->dev, NULL);

	return 0;