diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:14:54 -0800 |
| commit | b02957d58a27525499ab10d272d3b44682a7ae50 (patch) | |
| tree | a220aaf44026a8be815320b3c91f1db43bbf1e2c /drivers/staging/comedi/drivers/poc.c | |
| parent | 3a8954e8f22cf31791d8c524c2839433e39f9368 (diff) | |
| parent | b94c765ac31f8eb9c6fe895ba611bb446b799635 (diff) | |
Staging: Merge two branches of coding style fixes together
Turns out that multiple people sent pretty much the same patch
for the same staging drivers. Commit these in two different
branches and merge them together to get a more complete coverage
of the cleanup and properly credit everyone for the work that they
did.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/poc.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/poc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c index 8990bf2fc18..1ebc356ce40 100644 --- a/drivers/staging/comedi/drivers/poc.c +++ b/drivers/staging/comedi/drivers/poc.c @@ -128,15 +128,15 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) dev->board_name = this_board->name; if (iobase == 0) { - printk(KERN_WARNING "io base address required\n"); + printk(KERN_ERR "io base address required\n"); return -EINVAL; } iosize = this_board->iosize; /* check if io addresses are available */ if (!request_region(iobase, iosize, "dac02")) { - printk(KERN_WARNING "I/O port conflict: failed to allocate " - "ports 0x%lx to 0x%lx\n", iobase, iobase + iosize - 1); + printk(KERN_ERR "I/O port conflict: failed to allocate ports " + "0x%lx to 0x%lx\n", iobase, iobase + iosize - 1); return -EIO; } dev->iobase = iobase; |