linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Subject: [PATCH 3/7] smiapp: Initialise media entity after sensor init
Date: Wed,  7 Sep 2016 13:30:11 +0300	[thread overview]
Message-ID: <1473244215-19432-4-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1473244215-19432-1-git-send-email-sakari.ailus@linux.intel.com>

This allows determining the number of pads in the entity based on the
sensor.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
 drivers/media/i2c/smiapp/smiapp-core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 4f96797..fb0326d 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -3048,12 +3048,7 @@ static int smiapp_probe(struct i2c_client *client,
 	sensor->src->sd.internal_ops = &smiapp_internal_src_ops;
 	sensor->src->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
 	sensor->src->sensor = sensor;
-
 	sensor->src->pads[0].flags = MEDIA_PAD_FL_SOURCE;
-	rval = media_entity_pads_init(&sensor->src->sd.entity, 2,
-				 sensor->src->pads);
-	if (rval < 0)
-		return rval;
 
 	if (client->dev.of_node) {
 		rval = smiapp_init(sensor);
@@ -3061,6 +3056,11 @@ static int smiapp_probe(struct i2c_client *client,
 			goto out_media_entity_cleanup;
 	}
 
+	rval = media_entity_pads_init(&sensor->src->sd.entity, 2,
+				 sensor->src->pads);
+	if (rval < 0)
+		goto out_media_entity_cleanup;
+
 	rval = v4l2_async_register_subdev(&sensor->src->sd);
 	if (rval < 0)
 		goto out_media_entity_cleanup;
-- 
2.7.4


  parent reply	other threads:[~2016-09-07 10:31 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-07 10:30 [PATCH 0/7] More smiapp cleanups Sakari Ailus
2016-09-07 10:30 ` [PATCH 1/7] smiapp: Move sub-device initialisation into a separate function Sakari Ailus
2016-09-07 10:30 ` [PATCH 2/7] smiapp: Explicitly define number of pads in initialisation Sakari Ailus
2016-09-07 10:30 ` Sakari Ailus [this message]
2016-09-07 10:30 ` [PATCH 4/7] smiapp: Split off sub-device registration into two Sakari Ailus
2016-09-07 10:30 ` [PATCH 5/7] smiapp: Provide a common function to obtain native pixel array size Sakari Ailus
2016-09-07 10:30 ` [PATCH 6/7] smiapp: Remove unnecessary BUG_ON()'s Sakari Ailus
2016-09-07 10:30 ` [PATCH 7/7] smiapp: Always initialise the sensor in probe Sakari Ailus

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=1473244215-19432-4-git-send-email-sakari.ailus@linux.intel.com \
    --to=sakari.ailus@linux.intel.com \
    --cc=linux-media@vger.kernel.org \
    /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).