[media] smiapp: Move enumerating available media bus codes later
authorSakari Ailus <sakari.ailus@iki.fi>
Tue, 9 Dec 2014 17:22:31 +0000 (14:22 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Tue, 23 Dec 2014 13:49:01 +0000 (11:49 -0200)
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>
drivers/media/i2c/smiapp/smiapp-core.c

index fb8f8a85f8507bcb378bd8d02295859a9ce49ba9..aa27a1b2e1ae7dba08fafff90a79f68f0b93b188 100644 (file)
@@ -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;