V4L/DVB (11410): gspca - m5602-ov9650: Always init the ov9650 before starting a stream

This is a hack preventing a suspend-to-ram/disk regression.

Signed-off-by: Erik Andrén <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

diff --git a/drivers/media/video/gspca/m5602/m5602_ov9650.c b/drivers/media/video/gspca/m5602/m5602_ov9650.c
index bbf91356096c90f3e3216689c4b09647e3f67687..6581479c0b301843971c86bbec2a3fa85b35f428 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_ov9650.c
+++ b/drivers/media/video/gspca/m5602/m5602_ov9650.c
@@ -139,6 +139,7 @@ int ov9650_init(struct sd *sd)
                data = 0x30;
                err = m5602_write_sensor(sd, OV9650_MVFP, &data, 1);
        }
+
        return err;
 }
 
@@ -147,6 +148,10 @@ int ov9650_start(struct sd *sd)
        int i, err = 0;
        struct cam *cam = &sd->gspca_dev.cam;
 
+       err = ov9650_init(sd);
+       if (err < 0)
+               return err;
+
        for (i = 0; i < ARRAY_SIZE(res_init_ov9650) && !err; i++) {
                if (res_init_ov9650[i][0] == BRIDGE)
                        err = m5602_write_bridge(sd, res_init_ov9650[i][1], res_init_ov9650[i][2]);