V4L/DVB (5743): Tuner: clean up kfree() after release

Although it is safe to kfree(NULL), We only need to kfree(priv)
if the release callback is undefined.  As it stands now, there
is some redundancy in the operation of releasing the priv data
structures. This patch will call kfree(priv) and set priv to NULL,
if the release callback isnt defined.  Otherwise, let the release
callback handle this itself.
Thanks to Mauro Carvalho Chehab for suggesting this.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 0e71a22f1d4f6cff2f265e796fa1ad454fb002ac..acbffbfdb5084ddd8a7ca463be8c9de6ef00a22e 100644 (file)
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -180,8 +180,10 @@ static void set_type(struct i2c_client *c, unsigned int type,
        /* discard private data, in case set_type() was previously called */
        if (t->release)
                t->release(c);
-       kfree(t->priv);
-       t->priv = NULL;
+       else {
+               kfree(t->priv);
+               t->priv = NULL;
+       }
 
        switch (t->type) {
        case TUNER_MT2032:
@@ -566,7 +568,9 @@ static int tuner_detach(struct i2c_client *client)
 
        if (t->release)
                t->release(client);
-       kfree(t->priv);
+       else {
+               kfree(t->priv);
+       }
        kfree(t);
        return 0;
 }