From: Hans Verkuil <hverkuil-cisco@xs4all.nl>
To: linux-media@vger.kernel.org
Cc: sakari.ailus@linux.intel.com,
Kieran Bingham <kieran.bingham@ideasonboard.com>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>
Subject: [PATCH 6/6] pxa_camera: fix smatch warning
Date: Thu, 7 Feb 2019 10:13:38 +0100 [thread overview]
Message-ID: <20190207091338.55705-7-hverkuil-cisco@xs4all.nl> (raw)
In-Reply-To: <20190207091338.55705-1-hverkuil-cisco@xs4all.nl>
drivers/media/platform/pxa_camera.c:2400 pxa_camera_probe() error: we previously assumed 'pcdev->pdata' could be null (see line 2397)
First check if platform data is provided, then check if DT data is provided,
and if neither is provided just return with -ENODEV.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/platform/pxa_camera.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
index 5f930560eb30..3cf3c6390cc8 100644
--- a/drivers/media/platform/pxa_camera.c
+++ b/drivers/media/platform/pxa_camera.c
@@ -2394,15 +2394,17 @@ static int pxa_camera_probe(struct platform_device *pdev)
pcdev->res = res;
pcdev->pdata = pdev->dev.platform_data;
- if (pdev->dev.of_node && !pcdev->pdata) {
- err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev, &pcdev->asd);
- } else {
+ if (pcdev->pdata) {
pcdev->platform_flags = pcdev->pdata->flags;
pcdev->mclk = pcdev->pdata->mclk_10khz * 10000;
pcdev->asd.match_type = V4L2_ASYNC_MATCH_I2C;
pcdev->asd.match.i2c.adapter_id =
pcdev->pdata->sensor_i2c_adapter_id;
pcdev->asd.match.i2c.address = pcdev->pdata->sensor_i2c_address;
+ } else if (pdev->dev.of_node) {
+ err = pxa_camera_pdata_from_dt(&pdev->dev, pcdev, &pcdev->asd);
+ } else {
+ return -ENODEV;
}
if (err < 0)
return err;
--
2.20.1
next prev parent reply other threads:[~2019-02-07 9:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 9:13 [PATCH 0/6] sparse/smatch fixes Hans Verkuil
2019-02-07 9:13 ` [PATCH 1/6] hdpvr: fix smatch warning Hans Verkuil
2019-02-07 9:13 ` [PATCH 2/6] vim2m: " Hans Verkuil
2019-02-07 9:13 ` [PATCH 3/6] uvc: " Hans Verkuil
2019-02-07 14:57 ` Kieran Bingham
2019-02-07 15:41 ` Laurent Pinchart
2019-02-07 16:35 ` Hans Verkuil
2019-02-07 9:13 ` [PATCH 4/6] vsp1: " Hans Verkuil
2019-02-12 13:48 ` Kieran Bingham
2019-02-12 16:31 ` Laurent Pinchart
2019-02-07 9:13 ` [PATCH 5/6] omap3isp: fix sparse warning Hans Verkuil
2019-02-07 9:18 ` Hans Verkuil
2019-02-07 14:23 ` Sakari Ailus
2019-02-07 15:45 ` Laurent Pinchart
2019-02-07 9:13 ` Hans Verkuil [this message]
2019-02-07 14:11 ` [PATCH 6/6] pxa_camera: fix smatch warning Sakari Ailus
2019-02-07 14:38 ` [PATCH 7/6] omap4iss: fix sparse warning Hans Verkuil
2019-02-07 14:51 ` Sakari Ailus
2019-02-07 15:47 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190207091338.55705-7-hverkuil-cisco@xs4all.nl \
--to=hverkuil-cisco@xs4all.nl \
--cc=kieran.bingham@ideasonboard.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).