diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-30 05:51:07 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-30 05:51:07 -0200 |
| commit | 51f4c3f28fbfcbeff8b9ff3df1e0178b8e27c5a0 (patch) | |
| tree | 02f556b7fe28c348e1ea009c57999c985de8f3b9 /linux/drivers/media/dvb/dm1105 | |
| parent | 709958b74274a916790bc589e5d31ef95f90be86 (diff) | |
| parent | 3406a0aa7630cd74e82a090e2c2c9b2f00152481 (diff) | |
| download | mediapointer-dvb-s2-51f4c3f28fbfcbeff8b9ff3df1e0178b8e27c5a0.tar.gz mediapointer-dvb-s2-51f4c3f28fbfcbeff8b9ff3df1e0178b8e27c5a0.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/dm1105')
| -rw-r--r-- | linux/drivers/media/dvb/dm1105/dm1105.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/dm1105/dm1105.c b/linux/drivers/media/dvb/dm1105/dm1105.c index 19daa752f..f578cbdb6 100644 --- a/linux/drivers/media/dvb/dm1105/dm1105.c +++ b/linux/drivers/media/dvb/dm1105/dm1105.c @@ -367,11 +367,7 @@ static int __devinit dm1105dvb_dma_map(struct dm1105dvb *dm1105dvb) { dm1105dvb->ts_buf = pci_alloc_consistent(dm1105dvb->pdev, 6*DM1105_DMA_BYTES, &dm1105dvb->dma_addr); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) - return pci_dma_mapping_error(dm1105dvb->dma_addr); -#else - return pci_dma_mapping_error(dm1105dvb->pdev, dm1105dvb->dma_addr); -#endif + return !dm1105dvb->ts_buf; } static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb) |