diff options
Diffstat (limited to 'drivers/media/usb/gspca/mars.c')
| -rw-r--r-- | drivers/media/usb/gspca/mars.c | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/mars.c b/drivers/media/usb/gspca/mars.c index ff2c5abf115..779a8785f42 100644 --- a/drivers/media/usb/gspca/mars.c +++ b/drivers/media/usb/gspca/mars.c @@ -254,7 +254,8 @@ static int sd_start(struct gspca_dev *gspca_dev)  	int i;  	/* create the JPEG header */ -	jpeg_define(sd->jpeg_hdr, gspca_dev->height, gspca_dev->width, +	jpeg_define(sd->jpeg_hdr, gspca_dev->pixfmt.height, +			gspca_dev->pixfmt.width,  			0x21);		/* JPEG 422 */  	jpeg_set_qual(sd->jpeg_hdr, QUALITY); @@ -270,8 +271,8 @@ static int sd_start(struct gspca_dev *gspca_dev)  	data[0] = 0x00;		/* address */  	data[1] = 0x0c | 0x01;	/* reg 0 */  	data[2] = 0x01;		/* reg 1 */ -	data[3] = gspca_dev->width / 8;		/* h_size , reg 2 */ -	data[4] = gspca_dev->height / 8;	/* v_size , reg 3 */ +	data[3] = gspca_dev->pixfmt.width / 8;	/* h_size , reg 2 */ +	data[4] = gspca_dev->pixfmt.height / 8;	/* v_size , reg 3 */  	data[5] = 0x30;		/* reg 4, MI, PAS5101 :  				 *	0x30 for 24mhz , 0x28 for 12mhz */  	data[6] = 0x02;		/* reg 5, H start - was 0x04 */  | 
