All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] em28xx: remove dead code line from em28xx_audio_setup()
@ 2014-09-13  8:56 Frank Schäfer
  0 siblings, 0 replies; only message in thread
From: Frank Schäfer @ 2014-09-13  8:56 UTC (permalink / raw)
  To: m.chehab; +Cc: linux-media, Frank Schäfer

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>
---
 drivers/media/usb/em28xx/em28xx-core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 91ea3e4..bfe0726 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -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 */
-- 
1.8.4.5


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2014-09-13  8:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-13  8:56 [PATCH] em28xx: remove dead code line from em28xx_audio_setup() Frank Schäfer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.