Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Linux Build Service Account 2013-11-21 01:43:08 -08:00 committed by Gerrit - the friendly Code Review server
parent fb45428116 646124a8e7
commit 97ab36a2cf
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/radio/radio-tavarua.c
View File

@ -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);