Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / drivers / media / radio / radio-timb.c

diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c
index 7052adc0c0b0547a09f68534059912d769938482..5cf07779f4bb2b1ccddad9756f772184e036bed3 100644 (file)
--- a/drivers/media/radio/radio-timb.c
+++ b/drivers/media/radio/radio-timb.c
@@ -85,7 +85,7 @@ static int timbradio_vidioc_g_audio(struct file *file, void *priv,
 }
 
 static int timbradio_vidioc_s_audio(struct file *file, void *priv,
-       struct v4l2_audio *a)
+       const struct v4l2_audio *a)
 {
        return a->index ? -EINVAL : 0;
 }
@@ -157,7 +157,7 @@ static int __devinit timbradio_probe(struct platform_device *pdev)
                goto err;
        }
 
-       tr = kzalloc(sizeof(*tr), GFP_KERNEL);
+       tr = devm_kzalloc(&pdev->dev, sizeof(*tr), GFP_KERNEL);
        if (!tr) {
                err = -ENOMEM;
                goto err;
@@ -177,7 +177,7 @@ static int __devinit timbradio_probe(struct platform_device *pdev)
        strlcpy(tr->v4l2_dev.name, DRIVER_NAME, sizeof(tr->v4l2_dev.name));
        err = v4l2_device_register(NULL, &tr->v4l2_dev);
        if (err)
-               goto err_v4l2_dev;
+               goto err;
 
        tr->video_dev.v4l2_dev = &tr->v4l2_dev;
 
@@ -195,8 +195,6 @@ static int __devinit timbradio_probe(struct platform_device *pdev)
 err_video_req:
        video_device_release_empty(&tr->video_dev);
        v4l2_device_unregister(&tr->v4l2_dev);
-err_v4l2_dev:
-       kfree(tr);
 err:
        dev_err(&pdev->dev, "Failed to register: %d\n", err);
 
@@ -212,8 +210,6 @@ static int __devexit timbradio_remove(struct platform_device *pdev)
 
        v4l2_device_unregister(&tr->v4l2_dev);
 
-       kfree(tr);
-
        return 0;
 }