diff options
Diffstat (limited to 'drivers/media/usb/gspca/mr97310a.c')
-rw-r--r-- | drivers/media/usb/gspca/mr97310a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/gspca/mr97310a.c b/drivers/media/usb/gspca/mr97310a.c index 68bb2f359666..f006e29ca019 100644 --- a/drivers/media/usb/gspca/mr97310a.c +++ b/drivers/media/usb/gspca/mr97310a.c | |||
@@ -521,7 +521,7 @@ static int start_cif_cam(struct gspca_dev *gspca_dev) | |||
521 | if (sd->sensor_type) | 521 | if (sd->sensor_type) |
522 | data[5] = 0xbb; | 522 | data[5] = 0xbb; |
523 | 523 | ||
524 | switch (gspca_dev->width) { | 524 | switch (gspca_dev->pixfmt.width) { |
525 | case 160: | 525 | case 160: |
526 | data[9] |= 0x04; /* reg 8, 2:1 scale down from 320 */ | 526 | data[9] |= 0x04; /* reg 8, 2:1 scale down from 320 */ |
527 | /* fall thru */ | 527 | /* fall thru */ |
@@ -618,7 +618,7 @@ static int start_vga_cam(struct gspca_dev *gspca_dev) | |||
618 | data[10] = 0x18; | 618 | data[10] = 0x18; |
619 | } | 619 | } |
620 | 620 | ||
621 | switch (gspca_dev->width) { | 621 | switch (gspca_dev->pixfmt.width) { |
622 | case 160: | 622 | case 160: |
623 | data[9] |= 0x0c; /* reg 8, 4:1 scale down */ | 623 | data[9] |= 0x0c; /* reg 8, 4:1 scale down */ |
624 | /* fall thru */ | 624 | /* fall thru */ |
@@ -847,7 +847,7 @@ static void setexposure(struct gspca_dev *gspca_dev, s32 expo, s32 min_clockdiv) | |||
847 | u8 clockdiv = (60 * expo + 7999) / 8000; | 847 | u8 clockdiv = (60 * expo + 7999) / 8000; |
848 | 848 | ||
849 | /* Limit framerate to not exceed usb bandwidth */ | 849 | /* Limit framerate to not exceed usb bandwidth */ |
850 | if (clockdiv < min_clockdiv && gspca_dev->width >= 320) | 850 | if (clockdiv < min_clockdiv && gspca_dev->pixfmt.width >= 320) |
851 | clockdiv = min_clockdiv; | 851 | clockdiv = min_clockdiv; |
852 | else if (clockdiv < 2) | 852 | else if (clockdiv < 2) |
853 | clockdiv = 2; | 853 | clockdiv = 2; |