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

Commit 97ab36a2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radio: tavarua: Fixes for memory leaks."

parents fb454281 646124a8

drivers/media/radio/radio-tavarua.c

+18 −10
Original line number Diff line number Diff line
@@ -4472,8 +4472,8 @@ static int __init tavarua_probe(struct platform_device *pdev) 


	struct marimba_fm_platform_data *tavarua_pdata;

	struct tavarua_device *radio;

	int retval;

	int i;

	int retval = 0;

	int i = 0, j = 0;

	FMDBG("%s: probe called\n", __func__);

	/* private data allocation */

	radio = kzalloc(sizeof(struct tavarua_device), GFP_KERNEL);
@@ -4486,6 +4486,7 @@ static int __init tavarua_probe(struct platform_device *pdev) 
	tavarua_pdata = pdev->dev.platform_data;

	radio->pdata = tavarua_pdata;

	radio->dev = &pdev->dev;

	radio->wqueue = NULL;

	platform_set_drvdata(pdev, radio);



	/* video device allocation */
@@ -4515,15 +4516,16 @@ static int __init tavarua_probe(struct platform_device *pdev) 
		if (kfifo_alloc_rc!=0) {

			printk(KERN_ERR "%s: failed allocating buffers %d\n",

				__func__, kfifo_alloc_rc);

			goto err_bufs;

			retval = -ENOMEM;

			goto err_all;

		}

	}

	/* initializing the device count  */

	atomic_set(&radio->users, 1);

	radio->xfr_in_progress = 0;

	radio->xfr_bytes_left = 0;

	for (i = 0; i < TAVARUA_XFR_MAX; i++)

		radio->pending_xfrs[i] = 0;

	for (j = 0; j < TAVARUA_XFR_MAX; j++)

		radio->pending_xfrs[j] = 0;



	/* init transmit data */

	radio->tx_mode = TAVARUA_TX_RT;
@@ -4554,11 +4556,16 @@ static int __init tavarua_probe(struct platform_device *pdev) 
    /*Start the worker thread for event handling and register read_int_stat

	as worker function*/

	radio->wqueue  = create_singlethread_workqueue("kfmradio");

	if (!radio->wqueue)

		return -ENOMEM;

	if (!radio->wqueue) {

		retval = -ENOMEM;

		goto err_all;

	}



	/* register video device */

	if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr)) {

	retval = video_register_device(radio->videodev,

			VFL_TYPE_RADIO,

			radio_nr);

	if (retval != 0) {

		printk(KERN_WARNING DRIVER_NAME

				": Could not register video device\n");

		goto err_all;
@@ -4568,8 +4575,9 @@ static int __init tavarua_probe(struct platform_device *pdev) 


err_all:

	video_device_release(radio->videodev);

err_bufs:

	for (; i > -1; i--)

	if (radio->wqueue)

		destroy_workqueue(radio->wqueue);

	for (i--; i >= 0; i--)

		kfifo_free(&radio->data_buf[i]);

err_radio:

	kfree(radio);