From 3cbe39ffac8699ea9f0c82ff12b0fb276e510cfd Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Tue, 11 Nov 2008 23:30:49 -0300 Subject: [PATCH] --- yaml --- r: 119542 b: refs/heads/master c: 11eb260a70b992b83fa2d15bb777cda3ee326c05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b5e4a125d25a..3f0657c95a73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7c31a1e754b5140eefeeb10c3c3be17f3702452 +refs/heads/master: 11eb260a70b992b83fa2d15bb777cda3ee326c05 diff --git a/trunk/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/trunk/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 66ab0c6e9783..5faeee3f70bf 100644 --- a/trunk/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/trunk/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -808,6 +808,12 @@ static int ttusb_alloc_iso_urbs(struct ttusb *ttusb) ISO_BUF_COUNT, &ttusb->iso_dma_handle); + if (!ttusb->iso_buffer) { + dprintk("%s: pci_alloc_consistent - not enough memory\n", + __func__); + return -ENOMEM; + } + memset(ttusb->iso_buffer, 0, ISO_FRAME_SIZE * FRAMES_PER_ISO_BUF * ISO_BUF_COUNT);