From 2e18de2a5a97c0b3c06fb3153513c6ced26e208f Mon Sep 17 00:00:00 2001
From: Ravishankar karkala Mallikarjunayya <ravishankar.km@greenturtles.in>
Date: Sat, 19 Nov 2011 10:06:57 +0530
Subject: [PATCH] --- yaml --- r: 281113 b: refs/heads/master c:
 408f6bcd2acfe03c1f86b1fd9f77e010447b0080 h: refs/heads/master i:   281111:
 2bd85ac111054641efd211c4fa087a9ccda5f840 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/comedi/drivers/pcl818.c | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 21ab42802ca1..7f2defb0c078 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c62a0ef42c119f6c36d6f228839e0f3aafba0dca
+refs/heads/master: 408f6bcd2acfe03c1f86b1fd9f77e010447b0080
diff --git a/trunk/drivers/staging/comedi/drivers/pcl818.c b/trunk/drivers/staging/comedi/drivers/pcl818.c
index bad7ee409ed4..7344a53a81c4 100644
--- a/trunk/drivers/staging/comedi/drivers/pcl818.c
+++ b/trunk/drivers/staging/comedi/drivers/pcl818.c
@@ -1841,34 +1841,26 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 		if (dma < 1)
 			goto no_dma;	/* DMA disabled */
 		if (((1 << dma) & this_board->DMAbits) == 0) {
-			printk(", DMA is out of allowed range, FAIL!\n");
+			printk(KERN_ERR "DMA is out of allowed range, FAIL!\n");
 			return -EINVAL;	/* Bad DMA */
 		}
 		ret = request_dma(dma, "pcl818");
-		if (ret) {
-			printk(", unable to allocate DMA %u, FAIL!\n", dma);
+		if (ret)
 			return -EBUSY;	/* DMA isn't free */
-		}
 		devpriv->dma = dma;
-		printk(", dma=%u", dma);
 		pages = 2;	/* we need 16KB */
 		devpriv->dmabuf[0] = __get_dma_pages(GFP_KERNEL, pages);
-		if (!devpriv->dmabuf[0]) {
-			printk(", unable to allocate DMA buffer, FAIL!\n");
+		if (!devpriv->dmabuf[0])
 			/* maybe experiment with try_to_free_pages() will help .... */
 			return -EBUSY;	/* no buffer :-( */
-		}
 		devpriv->dmapages[0] = pages;
 		devpriv->hwdmaptr[0] = virt_to_bus((void *)devpriv->dmabuf[0]);
 		devpriv->hwdmasize[0] = (1 << pages) * PAGE_SIZE;
 		/* printk("%d %d %ld, ",devpriv->dmapages[0],devpriv->hwdmasize[0],PAGE_SIZE); */
 		if (devpriv->dma_rtc == 0) {	/*  we must do duble buff :-( */
 			devpriv->dmabuf[1] = __get_dma_pages(GFP_KERNEL, pages);
-			if (!devpriv->dmabuf[1]) {
-				printk
-				    (", unable to allocate DMA buffer, FAIL!\n");
+			if (!devpriv->dmabuf[1])
 				return -EBUSY;
-			}
 			devpriv->dmapages[1] = pages;
 			devpriv->hwdmaptr[1] =
 			    virt_to_bus((void *)devpriv->dmabuf[1]);