diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 20:04:18 -0400 |
| commit | 3afa294c40013be5d8180005002e3f648d04d942 (patch) | |
| tree | 8a8b7464fd8ee4901288afb3e9e8d761ef45647d /drivers/usb/media/pwc/pwc-if.c | |
| parent | a1541d5af66d02426655b1498f814c52347dd7d3 (diff) | |
| parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff) | |
merge by hand (qla_os.c mismerge)
Diffstat (limited to 'drivers/usb/media/pwc/pwc-if.c')
| -rw-r--r-- | drivers/usb/media/pwc/pwc-if.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c index 5429ff3b9753..b77e65c03659 100644 --- a/drivers/usb/media/pwc/pwc-if.c +++ b/drivers/usb/media/pwc/pwc-if.c | |||
| @@ -332,10 +332,6 @@ static int pwc_allocate_buffers(struct pwc_device *pdev) | |||
| 332 | #endif | 332 | #endif |
| 333 | ; | 333 | ; |
| 334 | } | 334 | } |
| 335 | if (kbuf == NULL) { | ||
| 336 | Err("Failed to allocate decompress table.\n"); | ||
| 337 | return -ENOMEM; | ||
| 338 | } | ||
| 339 | pdev->decompress_data = kbuf; | 335 | pdev->decompress_data = kbuf; |
| 340 | 336 | ||
| 341 | /* Allocate image buffer; double buffer for mmap() */ | 337 | /* Allocate image buffer; double buffer for mmap() */ |