From patchwork Sat Sep 13 08:56:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 25920 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XSj7F-0002dK-7t; Sat, 13 Sep 2014 10:55:33 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1XSj7D-0001If-jW; Sat, 13 Sep 2014 10:55:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751763AbaIMIz2 (ORCPT + 1 other); Sat, 13 Sep 2014 04:55:28 -0400 Received: from mail-la0-f46.google.com ([209.85.215.46]:38954 "EHLO mail-la0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbaIMIzZ (ORCPT ); Sat, 13 Sep 2014 04:55:25 -0400 Received: by mail-la0-f46.google.com with SMTP id el20so2229632lab.19 for ; Sat, 13 Sep 2014 01:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=cKjyGYqcn5XAIlz7nr0T7KWilHB5SWd1Dyvlcx21E24=; b=u+5SlVKI0p0232TzPSOSpzE8AFAufLOUAuM/sQ2Kg4nWhXK0pMSGCf6+1gz4IfG+L0 2bLzYsIOyazAhdFGicOmC7h5Nm6tiVupTn/dF+F73cISK9zxKY2/+F39aFtASSX6tK8k thGHEzPkl+9hu3dsOIgFWtP8zF7X+dcwJr5FRW2ETa9D/UpchxwQ5BTq9HQHHtFGcrQz UmaYEdTmORNWsOvn3UCxgEazLSw1ZkqURlNQicTMKHXHBUqr+5DvzNuEEdgYP7dntt1s YYBD/FsyuwXHNjg0H9on8SyleNwQ+r/0QyCQk98dO3RNrygOtMHyx+Y8TRt12kil9ZbO x67Q== X-Received: by 10.112.19.70 with SMTP id c6mr14003544lbe.20.1410598523940; Sat, 13 Sep 2014 01:55:23 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-178-201-166-123.hsi08.unitymediagroup.de. [178.201.166.123]) by mx.google.com with ESMTPSA id oc1sm2133414lbb.45.2014.09.13.01.55.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Sep 2014 01:55:23 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: m.chehab@samsung.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH] em28xx: remove dead code line from em28xx_audio_setup() Date: Sat, 13 Sep 2014 10:56:46 +0200 Message-Id: <1410598606-889-1-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.8.4.5 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.9.13.84523 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1200_1299 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' 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 --- 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 */