V4L/DVB (9033): drivers/media/video/tda9840.c: unbreak

drivers/media/video/tda9840.c: In function 'tda9840_command':
drivers/media/video/tda9840.c:152: warning: 'result' is used uninitialized in this function

[mchehab@redhat.com: Fix conflict with another patch that were meant to solve the warning]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index 77bfd24ecfae4fa0039dbb4f47472b898d9d7f41..1c391f0328fd195c1f977956cae06d5ab02428fa 100644 (file)
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -71,7 +71,6 @@ static void tda9840_write(struct i2c_client *client, u8 reg, u8 val)
 
 static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)
 {
-       int result = 0;
        int byte = *(int *)arg;
 
        switch (cmd) {
@@ -176,9 +175,6 @@ static int tda9840_command(struct i2c_client *client, unsigned cmd, void *arg)
                return -ENOIOCTLCMD;
        }
 
-       if (result)
-               return -EIO;
-
        return 0;
 }