Commit 4283d387 authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: zoran: multiple assignments should be avoided 



Remove all multiple assignments.

Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent efdd0d42

drivers/staging/media/zoran/zoran_driver.c

+4 −2
Original line number Diff line number Diff line
@@ -678,12 +678,14 @@ static int zoran_g_selection(struct file *file, void *__fh, struct v4l2_selectio 
		sel->r.height = zr->jpg_settings.img_height;

		break;

	case V4L2_SEL_TGT_CROP_DEFAULT:

		sel->r.top = sel->r.left = 0;

		sel->r.top = 0;

		sel->r.left = 0;

		sel->r.width = BUZ_MIN_WIDTH;

		sel->r.height = BUZ_MIN_HEIGHT;

		break;

	case V4L2_SEL_TGT_CROP_BOUNDS:

		sel->r.top = sel->r.left = 0;

		sel->r.top = 0;

		sel->r.left = 0;

		sel->r.width = BUZ_MAX_WIDTH;

		sel->r.height = BUZ_MAX_HEIGHT;

		break;

drivers/staging/media/zoran/zr36016.c

+2 −1
Original line number Diff line number Diff line
@@ -361,7 +361,8 @@ static int zr36016_setup(struct videocodec *codec) 
		return -ENOSPC;

	}

	//mem structure init

	codec->data = ptr = kzalloc(sizeof(struct zr36016), GFP_KERNEL);

	ptr = kzalloc(sizeof(struct zr36016), GFP_KERNEL);

	codec->data = ptr;

	if (!ptr)

		return -ENOMEM;

drivers/staging/media/zoran/zr36050.c

+2 −1
Original line number Diff line number Diff line
@@ -754,7 +754,8 @@ static int zr36050_setup(struct videocodec *codec) 
		return -ENOSPC;

	}

	//mem structure init

	codec->data = ptr = kzalloc(sizeof(struct zr36050), GFP_KERNEL);

	ptr = kzalloc(sizeof(struct zr36050), GFP_KERNEL);

	codec->data = ptr;

	if (!ptr)

		return -ENOMEM;

drivers/staging/media/zoran/zr36060.c

+2 −1
Original line number Diff line number Diff line
@@ -790,7 +790,8 @@ static int zr36060_setup(struct videocodec *codec) 
		return -ENOSPC;

	}

	//mem structure init

	codec->data = ptr = kzalloc(sizeof(*ptr), GFP_KERNEL);

	ptr = kzalloc(sizeof(*ptr), GFP_KERNEL);

	codec->data = ptr;

	if (!ptr)

		return -ENOMEM;