diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-30 06:08:21 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-30 06:08:21 -0200 |
| commit | 99dba13c2a2034363c788d26173340fb15c0c35c (patch) | |
| tree | 3103fcabab3e7d3032a7da4b683bb6a859aad910 /linux/drivers/media/dvb/dm1105 | |
| parent | b1a4f9b5853cc26829270834d194ee8358cb6e53 (diff) | |
| parent | 72dcd14ea4cdcd3556de0fe17a85120578777e53 (diff) | |
| download | mediapointer-dvb-s2-99dba13c2a2034363c788d26173340fb15c0c35c.tar.gz mediapointer-dvb-s2-99dba13c2a2034363c788d26173340fb15c0c35c.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
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 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/dm1105/dm1105.c b/linux/drivers/media/dvb/dm1105/dm1105.c index d9d1e0a12..f578cbdb6 100644 --- a/linux/drivers/media/dvb/dm1105/dm1105.c +++ b/linux/drivers/media/dvb/dm1105/dm1105.c @@ -19,7 +19,6 @@ * */ -#include <linux/version.h> #include <linux/i2c.h> #include <linux/init.h> #include <linux/kernel.h> @@ -368,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) |