em28xx: remove dead code line from em28xx_audio_setup()

PATCH New Frank Schäfer 1 participant 1 message Sep 13, 2014

Subsystems (2)

Media (V4L/DVB) EM28XX VIDEO4LINUX driver

lore

Share & tools

lore

Frank Schäfer

author

2014-09-13 08:55 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/media/usb/em28xx/em28xx-core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

drivers/media/usb/em28xx/em28xx-core.c +2 -3

index 91ea3e4..bfe0726 100644
@@ -516,9 +516,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 */

Signature · 1 line

1.8.4.5