Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3071004ybj; Mon, 23 Sep 2019 14:17:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpUabl3/E5fqakjQRl+MaG9+w4EsO1/WjKwycHykG6NnDULVtXl0acqDJxSS9zL9dM+qy+ X-Received: by 2002:a17:906:76c2:: with SMTP id q2mr1648431ejn.202.1569273457855; Mon, 23 Sep 2019 14:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569273457; cv=none; d=google.com; s=arc-20160816; b=ExzqxZKYtUVmGScdiqVKPLZS8Bm7elrLKdlU4EwB2nr0QUwqqc0cNNmhxHsmSf9JL9 Lk0TeCDXpqKeSPCfBSPMaWh4E/jgLSXD1ImFI8FN0lSDr+1OMcc2x2ubPq4RIvgmZoGt carOEB0t41+ouUQibXdhHgSPVMVNO6h5I+mNmMUTqrMwk/0RS8wZftKausf9byCgaRD2 MfpMR1aJvnMVKvI3vLjiO81nPA22cFO+mrteLmf6U4tEmh72ldlhBHJ/IYrpMjiP+XJT Om3pWV3ErwN26fPlsX0hGmb7xPEPKPicu/DYmvyl7bQBmufPPaoUMsP5zfjbI++W8OcA BM7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ay1KVt7YYG6nNnZdT4jS0l9Ails3kk3mmmD4lVZDLPA=; b=BdAMJeK5m+Drg92Ryci+1xc8p9tZJzTv06glycQSyUgN2kaYU/DkTd419fqEFTGwYb eyzd0cL5cNAGyXlUnV9pdCtAEcG7e8rSNjChpegroSTIsC2Fck77HgF6KXkUqOKUIDqY L2qN3u3mSftGUtICXwEXz60dnaBASlFrliD/YX5Sb5hzB1vPGfCnjK/HRxCgBVKr/iVQ CPyKC5y8cw/bU0W4+i92ZVzhgoGWNg+JjJ0ft/9VhSP16erjJQABsVx+9yKLAqH86nQn QRc79jDPPtDMhbIjdEu3FiVNmn4ERS0W8CgcjnXGVG1rLCWRrBMIwah5hhllmjmqklOu e93A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=D1lrujPB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b30si7279420eda.200.2019.09.23.14.17.03; Mon, 23 Sep 2019 14:17:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=D1lrujPB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389054AbfIVSpN (ORCPT + 99 others); Sun, 22 Sep 2019 14:45:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388987AbfIVSpH (ORCPT ); Sun, 22 Sep 2019 14:45:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D901A21907; Sun, 22 Sep 2019 18:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569177906; bh=3J51t1zJfEomA/al1Z3i4PXwF7s1o8TPuA25Tg3ecf4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D1lrujPBnio+0SB3BXrij/EpHlGAKcp1LFqq2TkdF6Dj6KxVU0UmcjffKH5U6KwgN P21cJpkn3w57LdaLPXml72vtdcmDLTSIu4EybbyTHL0LU/L/TAhHrxW9ehj9jH7I6o lrv+7WRqYatgRA3TE0oO6iL8fKbdBUQX6jnjnXFQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fabio Estevam , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 023/203] media: i2c: ov5640: Check for devm_gpiod_get_optional() error Date: Sun, 22 Sep 2019 14:40:49 -0400 Message-Id: <20190922184350.30563-23-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fabio Estevam [ Upstream commit 8791a102ce579346cea9d2f911afef1c1985213c ] The power down and reset GPIO are optional, but the return value from devm_gpiod_get_optional() needs to be checked and propagated in the case of error, so that probe deferral can work. Signed-off-by: Fabio Estevam Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov5640.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index 759d60c6d6304..afe7920557a8f 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -3022,9 +3022,14 @@ static int ov5640_probe(struct i2c_client *client, /* request optional power down pin */ sensor->pwdn_gpio = devm_gpiod_get_optional(dev, "powerdown", GPIOD_OUT_HIGH); + if (IS_ERR(sensor->pwdn_gpio)) + return PTR_ERR(sensor->pwdn_gpio); + /* request optional reset pin */ sensor->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(sensor->reset_gpio)) + return PTR_ERR(sensor->reset_gpio); v4l2_i2c_subdev_init(&sensor->sd, client, &ov5640_subdev_ops); -- 2.20.1