[media] smiapp: Read frame format earlier

The information gathered during frame format reading will be required
earlier in the initialisation when it was available. Also return an error
if frame format cannot be obtained.

Signed-off-by: Sakari Ailus <[email protected]>
Reviewed-by: Sebastian Reichel <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 384a13b9733bf3879637c3a466bc5c5fdf1a8267..6ec17eab70ac70b773e8e60a3b07c3395f2b8ca2 100644 (file)
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2908,6 +2908,12 @@ static int smiapp_probe(struct i2c_client *client,
                goto out_power_off;
        }
 
+       rval = smiapp_read_frame_fmt(sensor);
+       if (rval) {
+               rval = -ENODEV;
+               goto out_power_off;
+       }
+
        /*
         * Handle Sensor Module orientation on the board.
         *
@@ -3030,8 +3036,6 @@ static int smiapp_probe(struct i2c_client *client,
 
        sensor->pixel_array->sd.entity.function = MEDIA_ENT_F_CAM_SENSOR;
 
-       /* final steps */
-       smiapp_read_frame_fmt(sensor);
        rval = smiapp_init_controls(sensor);
        if (rval < 0)
                goto out_cleanup;