Commit 175bad92 authored Aug 03, 2010 by Michael Grzeschik Committed by Mauro Carvalho Chehab Aug 08, 2010

V4L/DVB: mt9m111: init chip after read CHIP_VERSION



Moved mt9m111_init after the chip version detection passage: I
don't like the idea of writing on a device we haven't identified
yet.

Signed-off-by: Philipp Wiesner <p.wiesner@phytec.de>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent c8cf078e

drivers/media/video/mt9m111.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -969,10 +969,6 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
		mt9m111->swap_rgb_even_odd = 1;
		mt9m111->swap_rgb_red_blue = 1;

		ret = mt9m111_init(client);
		if (ret)
		goto ei2c;

		data = reg_read(CHIP_VERSION);

		switch (data) {
		@@ -993,6 +989,8 @@ static int mt9m111_video_probe(struct soc_camera_device *icd,
		goto ei2c;
		}

		ret = mt9m111_init(client);

		ei2c:
		return ret;
		}