diff options
Diffstat (limited to 'drivers/media/video/usbvideo/ibmcam.c')
-rw-r--r-- | drivers/media/video/usbvideo/ibmcam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c index a42c22294124..76f771b6a32f 100644 --- a/drivers/media/video/usbvideo/ibmcam.c +++ b/drivers/media/video/usbvideo/ibmcam.c | |||
@@ -1300,11 +1300,11 @@ static void ibmcam_model2_Packet1(struct uvd *uvd, unsigned short v1, unsigned s | |||
1300 | /* | 1300 | /* |
1301 | * ibmcam_model3_Packet1() | 1301 | * ibmcam_model3_Packet1() |
1302 | * | 1302 | * |
1303 | * 00_0078_012d | 1303 | * 00_0078_012d |
1304 | * 00_0097_012f | 1304 | * 00_0097_012f |
1305 | * 00_d141_0124 | 1305 | * 00_d141_0124 |
1306 | * 00_0096_0127 | 1306 | * 00_0096_0127 |
1307 | * 00_fea8_0124 | 1307 | * 00_fea8_0124 |
1308 | */ | 1308 | */ |
1309 | static void ibmcam_model3_Packet1(struct uvd *uvd, unsigned short v1, unsigned short v2) | 1309 | static void ibmcam_model3_Packet1(struct uvd *uvd, unsigned short v1, unsigned short v2) |
1310 | { | 1310 | { |
@@ -2687,7 +2687,7 @@ static void ibmcam_model4_setup_after_video_if(struct uvd *uvd) | |||
2687 | ibmcam_veio(uvd, 0, 0x0004, 0x0127); | 2687 | ibmcam_veio(uvd, 0, 0x0004, 0x0127); |
2688 | ibmcam_veio(uvd, 0, 0xfea8, 0x0124); | 2688 | ibmcam_veio(uvd, 0, 0xfea8, 0x0124); |
2689 | ibmcam_veio(uvd, 0, 0x00c0, 0x010c); | 2689 | ibmcam_veio(uvd, 0, 0x00c0, 0x010c); |
2690 | break; | 2690 | break; |
2691 | } | 2691 | } |
2692 | usb_clear_halt(uvd->dev, usb_rcvisocpipe(uvd->dev, uvd->video_endp)); | 2692 | usb_clear_halt(uvd->dev, usb_rcvisocpipe(uvd->dev, uvd->video_endp)); |
2693 | } | 2693 | } |
@@ -3238,7 +3238,7 @@ static void ibmcam_model3_setup_after_video_if(struct uvd *uvd) | |||
3238 | {0, 0x0062, 0x0107}, | 3238 | {0, 0x0062, 0x0107}, |
3239 | {0, 0x0003, 0x0111}, | 3239 | {0, 0x0003, 0x0111}, |
3240 | }; | 3240 | }; |
3241 | #define NUM_INIT_DATA | 3241 | #define NUM_INIT_DATA |
3242 | 3242 | ||
3243 | unsigned short compression = 0; /* 0=none, 7=best frame rate */ | 3243 | unsigned short compression = 0; /* 0=none, 7=best frame rate */ |
3244 | int f_rate; /* 0=Fastest 7=slowest */ | 3244 | int f_rate; /* 0=Fastest 7=slowest */ |