From 427f85dcc1a8639efa598844420de09a2fb3d1c3 Mon Sep 17 00:00:00 2001 From: Maurice Dawson Date: Fri, 19 Feb 2010 10:53:13 +0000 Subject: [PATCH] --- yaml --- r: 186858 b: refs/heads/master c: 8377e813c75cf5aca46032fb780ca74c923dbe86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_labpc.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d5451dfa3ba5..6162869c6bdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a917d4c4251314afc196fd7a7d9d10faff2effda +refs/heads/master: 8377e813c75cf5aca46032fb780ca74c923dbe86 diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.c b/trunk/drivers/staging/comedi/drivers/ni_labpc.c index dc3f398cb3ed..a01e35d4b31e 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc.c +++ b/trunk/drivers/staging/comedi/drivers/ni_labpc.c @@ -483,12 +483,10 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, printk("comedi%d: ni_labpc: %s, io 0x%lx", dev->minor, thisboard->name, iobase); - if (irq) { + if (irq) printk(", irq %u", irq); - } - if (dma_chan) { + if (dma_chan) printk(", dma %u", dma_chan); - } printk("\n"); if (iobase == 0) {