[media] em28xx: remove dead code line from em28xx_audio_setup()
authorFrank Schaefer <fschaefer.oss@googlemail.com>
Sat, 13 Sep 2014 08:56:46 +0000 (05:56 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 23 Sep 2014 19:13:42 +0000 (16:13 -0300)
Setting the value of the chip config register to EM28XX_CHIPCFG_AC97 in
case of a read error is a leftover from the past which is no longer
needed.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/em28xx/em28xx-core.c

index 3413763efd25db4d82bb7af113da906d71030f8e..b5e52fe7957aff0d047abb1f89caab275fcb1afd 100644 (file)
@@ -520,9 +520,8 @@ int em28xx_audio_setup(struct em28xx *dev)
        /* See how this device is configured */
        cfg = em28xx_read_reg(dev, EM28XX_R00_CHIPCFG);
        em28xx_info("Config register raw data: 0x%02x\n", cfg);
-       if (cfg < 0) {
-               /* Register read error?  */
-               cfg = EM28XX_CHIPCFG_AC97; /* Be conservative */
+       if (cfg < 0) { /* Register read error */
+               /* Be conservative */
                dev->int_audio_type = EM28XX_INT_AUDIO_AC97;
        } else if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) == 0x00) {
                /* The device doesn't have vendor audio at all */