From: Frank Schaefer Date: Sat, 13 Sep 2014 08:56:46 +0000 (-0300) Subject: [media] em28xx: remove dead code line from em28xx_audio_setup() X-Git-Tag: firefly_0821_release~176^2~2474^2~491 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43c3ea312c49efa01dc3b6cd5d78dd8bed27f347;p=firefly-linux-kernel-4.4.55.git [media] em28xx: remove dead code line from em28xx_audio_setup() 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c index 3413763efd25..b5e52fe7957a 100644 --- a/drivers/media/usb/em28xx/em28xx-core.c +++ b/drivers/media/usb/em28xx/em28xx-core.c @@ -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 */