summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/smiapp
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-12-09 14:22:31 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-12-23 11:49:01 -0200
commit5313c00266700d231d9b386d9c0e4faad710c729 (patch)
tree9fb3323052fd5730d8c836c99808c4a0b6268fbd /drivers/media/i2c/smiapp
parent2e9f3c1c4443b2e46ef15e021cdf693b16c5231d (diff)
downloadop-kernel-dev-5313c00266700d231d9b386d9c0e4faad710c729.zip
op-kernel-dev-5313c00266700d231d9b386d9c0e4faad710c729.tar.gz
[media] smiapp: Move enumerating available media bus codes later
As the controls creation is separated in two sections, the available media bus codes and link frequencies can be enumerated later on. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/i2c/smiapp')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index fb8f8a8..aa27a1b 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2703,12 +2703,6 @@ static int smiapp_init(struct smiapp_sensor *sensor)
if (sensor->minfo.smiapp_profile == SMIAPP_PROFILE_0)
pll->flags |= SMIAPP_PLL_FLAG_NO_OP_CLOCKS;
- rval = smiapp_get_mbus_formats(sensor);
- if (rval) {
- rval = -ENODEV;
- goto out_cleanup;
- }
-
for (i = 0; i < SMIAPP_SUBDEVS; i++) {
struct {
struct smiapp_subdev *ssd;
@@ -2778,6 +2772,12 @@ static int smiapp_init(struct smiapp_sensor *sensor)
if (rval < 0)
goto out_cleanup;
+ rval = smiapp_get_mbus_formats(sensor);
+ if (rval) {
+ rval = -ENODEV;
+ goto out_cleanup;
+ }
+
rval = smiapp_init_late_controls(sensor);
if (rval) {
rval = -ENODEV;
OpenPOWER on IntegriCloud