From patchwork Sun Apr 29 17:13:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10370609 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7401B60116 for ; Sun, 29 Apr 2018 17:13:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63B6728A18 for ; Sun, 29 Apr 2018 17:13:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 589C828A21; Sun, 29 Apr 2018 17:13:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3E7728A18 for ; Sun, 29 Apr 2018 17:13:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753980AbeD2RNq (ORCPT ); Sun, 29 Apr 2018 13:13:46 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:37775 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753963AbeD2RNo (ORCPT ); Sun, 29 Apr 2018 13:13:44 -0400 Received: by mail-pg0-f67.google.com with SMTP id a13-v6so4808141pgu.4; Sun, 29 Apr 2018 10:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HVJ6b4VH/Pv4h35inTGQIb1eligog/FGD255v46mNOc=; b=YvXnb+5rdVoqtJSjeRtWgN7iVVUuBbc9kmLAmpxtkRCWgGgtcRbBIcsuAbOzHwMaoz IeBTJW+qn6i4LmSq5oyeYrz7JK94re1MygB5okXUEv403IEW/SQIL3BU+IttOh7euCB+ vmJiXTsDVRznUmephPc9H9wgOBEkYF+O1Pv4R1dthcAJRQqz5iRzlgWRI6cRokU5EzNo E28sJZP6gCiGYgPdF5rWJ6yieiPWlCszALD/YtrQnkUdlTdOFDZ2kK8F1q1edR2GHbel lBSwpFbTsej4xfClU+0F1MrTXlGHjuyKLFCYs5R9K8nxPyetqC722H7v/p1Tl1eLXx+t V8+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HVJ6b4VH/Pv4h35inTGQIb1eligog/FGD255v46mNOc=; b=PXEpZD04q5fkxX7nwQZZiIrEXbZFMIUz08te0mF1wsUcj4eFN6fXIn6qsvGhDK9U7V WSibbOYmefFaILWhlzVEpF9HDeRsrKarZXZqlw1eP8ADxhnT/2P6F+0R/xrJiepL+uRG OoPN6u/XP2w4UGqCFZDpcOIBv4lVheiMsE/1PJZJEZ5dDyuT4PuLd/y/1sibICDPU6Ke se4JzFDtH++kvtJafn1gPCnL3iH+CrrXlPGPpMBYiuNHaJp37uUNKLsnWbYXf5x9Kyqw k9+dsh+2ixAuwsjBM0jBWNmc2zH107yzS++r+a3K1UnBOjC/uB76LqJtkJUfuOgYcjT4 Mp1w== X-Gm-Message-State: ALQs6tBsCvyrZw9jo8liTSHfW8xhJPdky4pAbBrLYAjUCfgZE3r9Gnph HVfjUiLZ9b/p/oax5ajh8k9+VA== X-Google-Smtp-Source: AB8JxZoPm0dcKogfyTm0RA2xZaJWTExxUiJwfF/1mNU3DMuScjVDEQ5gziHagTL8vqzYruUTo24c6Q== X-Received: by 2002:a17:902:b490:: with SMTP id y16-v6mr9582879plr.92.1525022024133; Sun, 29 Apr 2018 10:13:44 -0700 (PDT) Received: from localhost.localdomain ([240f:4:c2bc:1:754e:5a21:c35f:52a1]) by smtp.gmail.com with ESMTPSA id e10sm10168022pfn.67.2018.04.29.10.13.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Apr 2018 10:13:43 -0700 (PDT) From: Akinobu Mita To: linux-media@vger.kernel.org, devicetree@vger.kernel.org Cc: Akinobu Mita , Jacopo Mondi , Laurent Pinchart , Hans Verkuil , Sakari Ailus , Mauro Carvalho Chehab Subject: [PATCH v4 04/14] media: ov772x: add checks for register read errors Date: Mon, 30 Apr 2018 02:13:03 +0900 Message-Id: <1525021993-17789-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1525021993-17789-1-git-send-email-akinobu.mita@gmail.com> References: <1525021993-17789-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This change adds checks for register read errors and returns correct error code. Cc: Jacopo Mondi Cc: Laurent Pinchart Cc: Hans Verkuil Cc: Sakari Ailus Cc: Mauro Carvalho Chehab Reviewed-by: Jacopo Mondi Signed-off-by: Akinobu Mita --- * v4 - No changes drivers/media/i2c/ov772x.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c index b6223bf..3fdbe64 100644 --- a/drivers/media/i2c/ov772x.c +++ b/drivers/media/i2c/ov772x.c @@ -1146,7 +1146,7 @@ static int ov772x_set_fmt(struct v4l2_subdev *sd, static int ov772x_video_probe(struct ov772x_priv *priv) { struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev); - u8 pid, ver; + int pid, ver, midh, midl; const char *devname; int ret; @@ -1156,7 +1156,11 @@ static int ov772x_video_probe(struct ov772x_priv *priv) /* Check and show product ID and manufacturer ID. */ pid = ov772x_read(client, PID); + if (pid < 0) + return pid; ver = ov772x_read(client, VER); + if (ver < 0) + return ver; switch (VERSION(pid, ver)) { case OV7720: @@ -1172,13 +1176,17 @@ static int ov772x_video_probe(struct ov772x_priv *priv) goto done; } + midh = ov772x_read(client, MIDH); + if (midh < 0) + return midh; + midl = ov772x_read(client, MIDL); + if (midl < 0) + return midl; + dev_info(&client->dev, "%s Product ID %0x:%0x Manufacturer ID %x:%x\n", - devname, - pid, - ver, - ov772x_read(client, MIDH), - ov772x_read(client, MIDL)); + devname, pid, ver, midh, midl); + ret = v4l2_ctrl_handler_setup(&priv->hdl); done: