From 8e51d714e7549bc36d8519a6e34848f17687f906 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Fri, 24 Oct 2008 06:13:23 -0300 Subject: [PATCH] --- yaml --- r: 124117 b: refs/heads/master c: 7b51a70cbf0c9995caf59f7126d251e14a9e0686 h: refs/heads/master i: 124115: e316e35c3ee15c816757cb1fb0f1287811d189c5 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dm1105/dm1105.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c49e0f5c29c3..4af31bc5fdad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20dafb3b0696471cfaa3e2fc2769516ebda3daf9 +refs/heads/master: 7b51a70cbf0c9995caf59f7126d251e14a9e0686 diff --git a/trunk/drivers/media/dvb/dm1105/dm1105.c b/trunk/drivers/media/dvb/dm1105/dm1105.c index 5c16437d989d..f48f73aff195 100644 --- a/trunk/drivers/media/dvb/dm1105/dm1105.c +++ b/trunk/drivers/media/dvb/dm1105/dm1105.c @@ -367,7 +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); - return pci_dma_mapping_error(dm1105dvb->pdev, dm1105dvb->dma_addr); + return !dm1105dvb->ts_buf; } static void dm1105dvb_dma_unmap(struct dm1105dvb *dm1105dvb)