[media] m5mols: Do not reset the configured pixel format when unexpected

Initialize default pixel format in driver probe() rather than in
s_power handler. This also prevents resetting the configuration
applied before the device was powered on.

Acked-by: HeungJun Kim <riverful.kim@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/m5mols/m5mols_core.c b/drivers/media/video/m5mols/m5mols_core.c
index ea594cf0fa56ef06f804b0342fcbb11e9a00f06d..12f223f3d0fd0e27d836bc4f96dff13b5cff0551 100644 (file)
--- a/drivers/media/video/m5mols/m5mols_core.c
+++ b/drivers/media/video/m5mols/m5mols_core.c
@@ -864,13 +864,6 @@ static int m5mols_s_power(struct v4l2_subdev *sd, int on)
                ret = m5mols_sensor_power(info, true);
                if (!ret)
                        ret = m5mols_fw_start(sd);
-               if (ret)
-                       return ret;
-
-               info->ffmt[M5MOLS_RESTYPE_MONITOR] =
-                       m5mols_default_ffmt[M5MOLS_RESTYPE_MONITOR];
-               info->ffmt[M5MOLS_RESTYPE_CAPTURE] =
-                       m5mols_default_ffmt[M5MOLS_RESTYPE_CAPTURE];
                return ret;
        }
 
@@ -1007,6 +1000,8 @@ static int __devinit m5mols_probe(struct i2c_client *client,
                goto out_me;
        }
        info->res_type = M5MOLS_RESTYPE_MONITOR;
+       info->ffmt[0] = m5mols_default_ffmt[0];
+       info->ffmt[1] = m5mols_default_ffmt[1];
 
        ret = m5mols_sensor_power(info, true);
        if (ret)