diff options
Diffstat (limited to 'drivers/usb/media/pwc/pwc-ctrl.c')
| -rw-r--r-- | drivers/usb/media/pwc/pwc-ctrl.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c index 42ec468d52d6..53099190952c 100644 --- a/drivers/usb/media/pwc/pwc-ctrl.c +++ b/drivers/usb/media/pwc/pwc-ctrl.c | |||
| @@ -48,8 +48,6 @@ | |||
| 48 | #include "pwc-uncompress.h" | 48 | #include "pwc-uncompress.h" |
| 49 | #include "pwc-kiara.h" | 49 | #include "pwc-kiara.h" |
| 50 | #include "pwc-timon.h" | 50 | #include "pwc-timon.h" |
| 51 | #include "pwc-dec1.h" | ||
| 52 | #include "pwc-dec23.h" | ||
| 53 | 51 | ||
| 54 | /* Request types: video */ | 52 | /* Request types: video */ |
| 55 | #define SET_LUM_CTL 0x01 | 53 | #define SET_LUM_CTL 0x01 |
| @@ -246,7 +244,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra | |||
| 246 | switch(pdev->type) { | 244 | switch(pdev->type) { |
| 247 | case 645: | 245 | case 645: |
| 248 | case 646: | 246 | case 646: |
| 249 | pwc_dec1_init(pdev->type, pdev->release, buf, pdev->decompress_data); | 247 | /* pwc_dec1_init(pdev->type, pdev->release, buf, pdev->decompress_data); */ |
| 250 | break; | 248 | break; |
| 251 | 249 | ||
| 252 | case 675: | 250 | case 675: |
| @@ -256,7 +254,7 @@ static inline int set_video_mode_Nala(struct pwc_device *pdev, int size, int fra | |||
| 256 | case 730: | 254 | case 730: |
| 257 | case 740: | 255 | case 740: |
| 258 | case 750: | 256 | case 750: |
| 259 | pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); | 257 | /* pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); */ |
| 260 | break; | 258 | break; |
| 261 | } | 259 | } |
| 262 | } | 260 | } |
| @@ -318,8 +316,8 @@ static inline int set_video_mode_Timon(struct pwc_device *pdev, int size, int fr | |||
| 318 | if (ret < 0) | 316 | if (ret < 0) |
| 319 | return ret; | 317 | return ret; |
| 320 | 318 | ||
| 321 | if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW) | 319 | /* if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW) |
| 322 | pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); | 320 | pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); */ |
| 323 | 321 | ||
| 324 | pdev->cmd_len = 13; | 322 | pdev->cmd_len = 13; |
| 325 | memcpy(pdev->cmd_buf, buf, 13); | 323 | memcpy(pdev->cmd_buf, buf, 13); |
| @@ -397,8 +395,8 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr | |||
| 397 | if (ret < 0) | 395 | if (ret < 0) |
| 398 | return ret; | 396 | return ret; |
| 399 | 397 | ||
| 400 | if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW) | 398 | /* if (pChoose->bandlength > 0 && pdev->vpalette != VIDEO_PALETTE_RAW) |
| 401 | pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); | 399 | pwc_dec23_init(pdev->type, pdev->release, buf, pdev->decompress_data); */ |
| 402 | 400 | ||
| 403 | pdev->cmd_len = 12; | 401 | pdev->cmd_len = 12; |
| 404 | memcpy(pdev->cmd_buf, buf, 12); | 402 | memcpy(pdev->cmd_buf, buf, 12); |
