diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /drivers/media/dvb/cinergyT2/cinergyT2.c | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'drivers/media/dvb/cinergyT2/cinergyT2.c')
| -rw-r--r-- | drivers/media/dvb/cinergyT2/cinergyT2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index 206c13e47a06..9123147e376f 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c | |||
| @@ -287,7 +287,7 @@ static int cinergyt2_alloc_stream_urbs (struct cinergyt2 *cinergyt2) | |||
| 287 | int i; | 287 | int i; |
| 288 | 288 | ||
| 289 | cinergyt2->streambuf = usb_buffer_alloc(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE, | 289 | cinergyt2->streambuf = usb_buffer_alloc(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE, |
| 290 | SLAB_KERNEL, &cinergyt2->streambuf_dmahandle); | 290 | GFP_KERNEL, &cinergyt2->streambuf_dmahandle); |
| 291 | if (!cinergyt2->streambuf) { | 291 | if (!cinergyt2->streambuf) { |
| 292 | dprintk(1, "failed to alloc consistent stream memory area, bailing out!\n"); | 292 | dprintk(1, "failed to alloc consistent stream memory area, bailing out!\n"); |
| 293 | return -ENOMEM; | 293 | return -ENOMEM; |