From 24f89242b48ed775fb9e175de17f8e8d13d0f82b Mon Sep 17 00:00:00 2001 From: Ravishankar Date: Tue, 5 Jul 2011 19:22:49 +0530 Subject: [PATCH] --- yaml --- r: 259718 b: refs/heads/master c: ee4d07d8e1c72043299ac4118fbdee0ad883e966 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_daq_700.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 05ecc44f46e8..595472c0999f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3297d6c7c84a2a3f62b41b703a2963759e822e96 +refs/heads/master: ee4d07d8e1c72043299ac4118fbdee0ad883e966 diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c index 2672629e9ff9..e2420123db87 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c @@ -51,7 +51,7 @@ IRQ is assigned but not used. #include #include -static struct pcmcia_device *pcmcia_cur_dev = NULL; +static struct pcmcia_device *pcmcia_cur_dev; #define DIO700_SIZE 8 /* size of io region used by board */ @@ -381,11 +381,11 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) #endif break; default: - printk("bug! couldn't determine board type\n"); + printk(KERN_ERR "bug! couldn't determine board type\n"); return -EINVAL; break; } - printk("comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor, + printk(KERN_ERR "comedi%d: ni_daq_700: %s, io 0x%lx", dev->minor, thisboard->name, iobase); #ifdef incomplete if (irq) @@ -396,7 +396,7 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) printk("\n"); if (iobase == 0) { - printk("io base address is zero!\n"); + printk(KERN_ERR "io base address is zero!\n"); return -EINVAL; } @@ -421,7 +421,7 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) static int dio700_detach(struct comedi_device *dev) { - printk("comedi%d: ni_daq_700: cs-remove\n", dev->minor); + printk(KERN_ERR "comedi%d: ni_daq_700: cs-remove\n", dev->minor); if (dev->subdevices) subdev_700_cleanup(dev, dev->subdevices + 0);