From patchwork Fri Jan 17 17:45:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 21645 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1W4DTA-0005AT-Og; Fri, 17 Jan 2014 18:44:36 +0100 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-5) with esmtp id 1W4DT7-00010h-9N; Fri, 17 Jan 2014 18:44:35 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753137AbaAQRob (ORCPT + 1 other); Fri, 17 Jan 2014 12:44:31 -0500 Received: from mail-ee0-f54.google.com ([74.125.83.54]:43716 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753132AbaAQRo2 (ORCPT ); Fri, 17 Jan 2014 12:44:28 -0500 Received: by mail-ee0-f54.google.com with SMTP id e53so1502612eek.41 for ; Fri, 17 Jan 2014 09:44:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=Fydir66vI3tAdnr/tNNp2bBZueO9m+tz6RxO2FyCjdY=; b=TGpizfOTZDWFWpPTbOhpUasmA4Au+AJ3Vd4BE/LirNJQrXfg3rQnGqRiV6ZptzxCpu KRVXnYb3nQvsbOi0ZaLE53NRzzyfL+zQ2fyVfpZB6FWiAQ6ne+qt8h7LJvbs6S4ABE46 MeYjsDYDkowMFEBgHQc47gk5saCdT65ADoDTI2LDFFs9un4eyhuhc8dSxj63RG9YMIs/ AW9LHfvTcqaXq4acIhzclsRh4BDrpBEHS1rJma4hcRlIH0JkYruhXkFpUK8NjO+wvxJn FY0hbhZOls9ZxVjnvC9suAlZ/q4/m/DMLFqJvSrMgxAZdxTGd+rWoPXAlI+aRF9CEMT9 2uWg== X-Received: by 10.14.115.133 with SMTP id e5mr3811836eeh.91.1389980667794; Fri, 17 Jan 2014 09:44:27 -0800 (PST) Received: from Athlon64X2-5000.site (ip-178-200-115-160.unitymediagroup.de. [178.200.115.160]) by mx.google.com with ESMTPSA id z49sm15841147eeo.10.2014.01.17.09.44.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jan 2014 09:44:27 -0800 (PST) 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 2/3] em28xx-camera: fix return value checks on sensor probing Date: Fri, 17 Jan 2014 18:45:31 +0100 Message-Id: <1389980732-8375-2-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389980732-8375-1-git-send-email-fschaefer.oss@googlemail.com> References: <1389980732-8375-1-git-send-email-fschaefer.oss@googlemail.com> 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.1.17.173615 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_1500_1599 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, __IN_REP_TO 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, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Since commit e63b009d6e the returned error code in case of not connected/responding i2c clients is ENXIO isntead of ENODEV, which causes several error messages on sensor probing. Fix the i2c return value checks on sensor probing to silence these warnings. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-camera.c | 4 ++-- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-camera.c b/drivers/media/usb/em28xx/em28xx-camera.c index c29f5c4..505e050 100644 --- a/drivers/media/usb/em28xx/em28xx-camera.c +++ b/drivers/media/usb/em28xx/em28xx-camera.c @@ -120,7 +120,7 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) reg = 0x00; ret = i2c_master_send(&client, ®, 1); if (ret < 0) { - if (ret != -ENODEV) + if (ret != -ENXIO) em28xx_errdev("couldn't read from i2c device 0x%02x: error %i\n", client.addr << 1, ret); continue; @@ -218,7 +218,7 @@ static int em28xx_probe_sensor_omnivision(struct em28xx *dev) reg = 0x1c; ret = i2c_smbus_read_byte_data(&client, reg); if (ret < 0) { - if (ret != -ENODEV) + if (ret != -ENXIO) em28xx_errdev("couldn't read from i2c device 0x%02x: error %i\n", client.addr << 1, ret); continue;