From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: sre@kernel.org
Subject: [PATCH v3 03/18] smiapp: Initialise media entity after sensor init
Date: Tue, 20 Sep 2016 01:02:36 +0300 [thread overview]
Message-ID: <1474322571-20290-4-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1474322571-20290-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 2090b7f..4f97503 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -3058,12 +3058,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);
@@ -3071,6 +3066,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.1.4
next prev parent reply other threads:[~2016-09-19 22:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-19 22:02 [PATCH v3 00/18] More smiapp cleanups, fixes Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 01/18] smiapp: Move sub-device initialisation into a separate function Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 02/18] smiapp: Explicitly define number of pads in initialisation Sakari Ailus
2016-09-19 22:02 ` Sakari Ailus [this message]
2016-09-19 22:02 ` [PATCH v3 04/18] smiapp: Split off sub-device registration into two Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 05/18] smiapp: Provide a common function to obtain native pixel array size Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 06/18] smiapp: Remove unnecessary BUG_ON()'s Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 07/18] smiapp: Always initialise the sensor in probe Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 08/18] smiapp: Fix resource management in registration failure Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 09/18] smiapp: Merge smiapp_init() with smiapp_probe() Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 10/18] smiapp: Read frame format earlier Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 11/18] smiapp: Unify setting up sub-devices Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 12/18] smiapp: Use SMIAPP_PADS when referring to number of pads Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 13/18] smiapp: Obtain frame layout from the frame descriptor Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 14/18] smiapp: Improve debug messages from frame layout reading Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 15/18] smiapp: Remove useless newlines and other small cleanups Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 16/18] smiapp: Obtain correct media bus code for try format Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 17/18] smiapp: Drop a debug print on frame size and bit depth Sakari Ailus
2016-09-19 22:02 ` [PATCH v3 18/18] smiapp-pll: Don't complain aloud about failing PLL calculation Sakari Ailus
2016-09-19 23:27 ` [PATCH v3 00/18] More smiapp cleanups, fixes Sebastian Reichel
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=1474322571-20290-4-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=linux-media@vger.kernel.org \
--cc=sre@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).