From e3f01a67dc40bcc0f69ab5b6f9a4288bb6384a20 Mon Sep 17 00:00:00 2001 From: Maurice Dawson Date: Fri, 19 Mar 2010 14:20:10 +0000 Subject: [PATCH] --- yaml --- r: 196909 b: refs/heads/master c: cf8d3af5aed0d7bc40e8966b45aeced7c7bf1bef h: refs/heads/master i: 196907: 8504c7ef40bbb9aff82ef88a4028a6bd3ae3ab9d v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/adl_pci9118.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index cab1ca0d6c0b..20e49a0b350d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 242467bd058f09ec05985bb09201a9cd0b1d89e5 +refs/heads/master: cf8d3af5aed0d7bc40e8966b45aeced7c7bf1bef diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9118.c b/trunk/drivers/staging/comedi/drivers/adl_pci9118.c index 4f9fd7dd0cf2..2205113ee435 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9118.c @@ -750,9 +750,8 @@ static void interrupt_pci9118_ai_dma(struct comedi_device *dev, comedi_event(dev, s); return; } - if (int_adstat & devpriv->ai_maskerr) -/* if (int_adstat & 0x106) */ + /* if (int_adstat & 0x106) */ if (pci9118_decode_error_status(dev, s, int_adstat)) return; @@ -2215,10 +2214,10 @@ static int pci9118_attach(struct comedi_device *dev, if (!pcidev) { if (opt_bus || opt_slot) { - printk(" - Card at b:s %d:%d %s\n", + printk(KERN_ERR " - Card at b:s %d:%d %s\n", opt_bus, opt_slot, errstr); } else { - printk(" - Card %s\n", errstr); + printk(KERN_ERR " - Card %s\n", errstr); } return -EIO; } @@ -2234,8 +2233,8 @@ static int pci9118_attach(struct comedi_device *dev, iobase_a = pci_resource_start(pcidev, 0); iobase_9 = pci_resource_start(pcidev, 2); - printk(", b:s:f=%d:%d:%d, io=0x%4lx, 0x%4lx", pci_bus, pci_slot, - pci_func, iobase_9, iobase_a); + printk(KERN_ERR ", b:s:f=%d:%d:%d, io=0x%4lx, 0x%4lx", pci_bus, + pci_slot, pci_func, iobase_9, iobase_a); dev->iobase = iobase_9; dev->board_name = this_board->name;