---

yaml --- r: 281375 b: refs/heads/master c: 904c029 h: refs/heads/master i: 281373: f552738 281371: a46e63f 281367: f45c847 281359: 51fcd6e 281343: 1e38ce0 v: v3
git-mirror · Dec 14, 2011 · d537fd4 · d537fd4
1 parent 52caa66
commit d537fd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a96b98f218fa7c854a591f4eb3cff90c13036d25
+refs/heads/master: 904c02968b4c714e5fb6e750e746d8eceb641dd9
diff --git a/trunk/drivers/staging/comedi/drivers/das1800.c b/trunk/drivers/staging/comedi/drivers/das1800.c
@@ -580,15 +580,16 @@ static int das1800_init_dma(struct comedi_device *dev, unsigned int dma0,
 			break;
 		}
 		if (request_dma(dma0, driver_das1800.driver_name)) {
-			printk(" failed to allocate dma channel %i\n", dma0);
+			dev_err(dev->hw_dev, "failed to allocate dma channel %i\n",
+				dma0);
 			return -EINVAL;
 		}
 		devpriv->dma0 = dma0;
 		devpriv->dma_current = dma0;
 		if (dma1) {
 			if (request_dma(dma1, driver_das1800.driver_name)) {
-				printk(" failed to allocate dma channel %i\n",
-				       dma1);
+				dev_err(dev->hw_dev, "failed to allocate dma channel %i\n",
+					dma1);
 				return -EINVAL;
 			}
 			devpriv->dma1 = dma1;