From 73b0df8e4a8b002f57a38b793b6d5a7c3e6ac2fb Mon Sep 17 00:00:00 2001 From: Ravishankar karkala Mallikarjunayya Date: Sat, 19 Nov 2011 10:06:46 +0530 Subject: [PATCH] --- yaml --- r: 281103 b: refs/heads/master c: 5d2d50745cff532617a7e44ac0201283535b17d5 h: refs/heads/master i: 281101: 7d8aa15d6d3c9b13ba0f7c953a90a7726ce6acee 281099: 34ecac3e2490cf2709dc02a67d6a9bbf953ca49c 281095: 7bd709916049da985bb86bb264056980ba16cca9 281087: b89bda3fdbb2f2a06cc8cf9598aab8a1d1415863 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/cb_pcimdas.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 20af37425406..fb085f864ef2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f00cf8ff356c7a6ad5debc38849f26b5125c390 +refs/heads/master: 5d2d50745cff532617a7e44ac0201283535b17d5 diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c index 5d25e788c8a6..8ba694263bd3 100644 --- a/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c +++ b/trunk/drivers/staging/comedi/drivers/cb_pcimdas.c @@ -341,16 +341,19 @@ static int cb_pcimdas_attach(struct comedi_device *dev, */ static int cb_pcimdas_detach(struct comedi_device *dev) { -#ifdef CBPCIMDAS_DEBUG if (devpriv) { - printk("devpriv->BADR0 = 0x%lx\n", devpriv->BADR0); - printk("devpriv->BADR1 = 0x%lx\n", devpriv->BADR1); - printk("devpriv->BADR2 = 0x%lx\n", devpriv->BADR2); - printk("devpriv->BADR3 = 0x%lx\n", devpriv->BADR3); - printk("devpriv->BADR4 = 0x%lx\n", devpriv->BADR4); + dev_dbg(dev->hw_dev, "devpriv->BADR0 = 0x%lx\n", + devpriv->BADR0); + dev_dbg(dev->hw_dev, "devpriv->BADR1 = 0x%lx\n", + devpriv->BADR1); + dev_dbg(dev->hw_dev, "devpriv->BADR2 = 0x%lx\n", + devpriv->BADR2); + dev_dbg(dev->hw_dev, "devpriv->BADR3 = 0x%lx\n", + devpriv->BADR3); + dev_dbg(dev->hw_dev, "devpriv->BADR4 = 0x%lx\n", + devpriv->BADR4); } -#endif - printk("comedi%d: cb_pcimdas: remove\n", dev->minor); + if (dev->irq) free_irq(dev->irq, dev); if (devpriv) {