Commit adea153b authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp-ov2680: Fix ov2680_set_fmt() 



On sets actually store the set (closest) format inside ov2680_device.dev,
so that it also properly gets returned by get_fmt.

This fixes the following problem:

1. App does an VIDIOC_SET_FMT 640x480, calling ov2680_set_fmt()
2. Internal buffers (atomisp_create_pipes_stream()) get allocated
   at 640x480 size by atomisp_set_fmt()
3. ov2680_get_fmt() gets called later on and returns 1600x1200
   since ov2680_device.dev was not updated. So things get configured
   to stream at 1600x1200, but the internal buffers created during
   atomisp_create_pipes_stream() do not get updated in size
4. streaming starts, internal buffers overflow and the entire
   machine freezes eventually due to memory being corrupted

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent a25a64b5

drivers/staging/media/atomisp/i2c/atomisp-ov2680.c

+1 −5
Original line number Diff line number Diff line
@@ -894,11 +894,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, 
	if (v_flag)

		ov2680_v_flip(sd, v_flag);



	/*

	 * ret = startup(sd);

	 * if (ret)

	 * dev_err(&client->dev, "ov2680 startup err\n");

	 */

	dev->res = res;

err:

	mutex_unlock(&dev->input_lock);

	return ret;