diff options
Diffstat (limited to 'drivers/media/usb/gspca/vicam.c')
-rw-r--r-- | drivers/media/usb/gspca/vicam.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/usb/gspca/vicam.c b/drivers/media/usb/gspca/vicam.c index a2275cfe0b81..103f6c4236b0 100644 --- a/drivers/media/usb/gspca/vicam.c +++ b/drivers/media/usb/gspca/vicam.c | |||
@@ -121,13 +121,13 @@ static int vicam_read_frame(struct gspca_dev *gspca_dev, u8 *data, int size) | |||
121 | 121 | ||
122 | memset(req_data, 0, 16); | 122 | memset(req_data, 0, 16); |
123 | req_data[0] = gain; | 123 | req_data[0] = gain; |
124 | if (gspca_dev->width == 256) | 124 | if (gspca_dev->pixfmt.width == 256) |
125 | req_data[1] |= 0x01; /* low nibble x-scale */ | 125 | req_data[1] |= 0x01; /* low nibble x-scale */ |
126 | if (gspca_dev->height <= 122) { | 126 | if (gspca_dev->pixfmt.height <= 122) { |
127 | req_data[1] |= 0x10; /* high nibble y-scale */ | 127 | req_data[1] |= 0x10; /* high nibble y-scale */ |
128 | unscaled_height = gspca_dev->height * 2; | 128 | unscaled_height = gspca_dev->pixfmt.height * 2; |
129 | } else | 129 | } else |
130 | unscaled_height = gspca_dev->height; | 130 | unscaled_height = gspca_dev->pixfmt.height; |
131 | req_data[2] = 0x90; /* unknown, does not seem to do anything */ | 131 | req_data[2] = 0x90; /* unknown, does not seem to do anything */ |
132 | if (unscaled_height <= 200) | 132 | if (unscaled_height <= 200) |
133 | req_data[3] = 0x06; /* vend? */ | 133 | req_data[3] = 0x06; /* vend? */ |