diff options
| -rw-r--r-- | drivers/staging/media/zoran/zoran_driver.c | 6 | 
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/media/zoran/zoran_driver.c b/drivers/staging/media/zoran/zoran_driver.c index 518ba19e1e0a..db85978a2893 100644 --- a/drivers/staging/media/zoran/zoran_driver.c +++ b/drivers/staging/media/zoran/zoran_driver.c @@ -401,11 +401,9 @@ static void jpg_fbuffer_free(struct zoran_fh *fh)  /*   *   V4L Buffer grabbing   */ - -static int zoran_v4l_set_format(struct zoran_fh *fh, int width, int height, +static int zoran_v4l_set_format(struct zoran *zr, int width, int height,  				const struct zoran_format *format)  { -	struct zoran *zr = fh->zr;  	int bpp;  	/* Check size and format of the grab wanted */ @@ -1671,7 +1669,7 @@ static int zoran_s_fmt_vid_cap(struct file *file, void *__fh,  	map_mode_raw(fh); -	res = zoran_v4l_set_format(fh, fmt->fmt.pix.width, fmt->fmt.pix.height, +	res = zoran_v4l_set_format(zr, fmt->fmt.pix.width, fmt->fmt.pix.height,  				   &zoran_formats[i]);  	if (res)  		return res;  | 
