diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-04-22 21:11:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 11:00:32 -0700 |
| commit | c3744138715045adb316284ee7a1e608f0278f6c (patch) | |
| tree | c09db751ca55dca2e5c7e7d956c4d4588985ad65 /drivers/staging/comedi/drivers/ni_atmio.c | |
| parent | 46dbd1486e6c75f8cd136e3899015906f83cd8de (diff) | |
| download | kernel_samsung_smdk4412-c3744138715045adb316284ee7a1e608f0278f6c.zip kernel_samsung_smdk4412-c3744138715045adb316284ee7a1e608f0278f6c.tar.gz kernel_samsung_smdk4412-c3744138715045adb316284ee7a1e608f0278f6c.tar.bz2 | |
Staging: comedi: remove assignment in conditionals
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_atmio.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_atmio.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c index f8dda9a..c4c4749 100644 --- a/drivers/staging/comedi/drivers/ni_atmio.c +++ b/drivers/staging/comedi/drivers/ni_atmio.c @@ -414,8 +414,10 @@ static int ni_atmio_attach(struct comedi_device *dev, struct comedi_devconfig *i unsigned int irq; /* allocate private area */ - if ((ret = ni_alloc_private(dev)) < 0) + ret = ni_alloc_private(dev); + if (ret < 0) return ret; + devpriv->stc_writew = &ni_atmio_win_out; devpriv->stc_readw = &ni_atmio_win_in; devpriv->stc_writel = &win_out2; @@ -476,8 +478,10 @@ static int ni_atmio_attach(struct comedi_device *dev, struct comedi_devconfig *i return -EINVAL; } printk(" ( irq = %u )", irq); - if ((ret = comedi_request_irq(irq, ni_E_interrupt, - NI_E_IRQ_FLAGS, "ni_atmio", dev)) < 0) { + ret = comedi_request_irq(irq, ni_E_interrupt, + NI_E_IRQ_FLAGS, "ni_atmio", dev); + + if (ret < 0) { printk(" irq not available\n"); return -EINVAL; } @@ -486,7 +490,8 @@ static int ni_atmio_attach(struct comedi_device *dev, struct comedi_devconfig *i /* generic E series stuff in ni_mio_common.c */ - if ((ret = ni_E_init(dev, it)) < 0) { + ret = ni_E_init(dev, it); + if (ret < 0) { return ret; } |