diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-09-07 17:48:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-07 21:54:42 -0700 |
| commit | 39780a1caf92342c4deb0d14d39703cf5c70cdac (patch) | |
| tree | 01761ffd45ce850753735f802950db8d7230478b | |
| parent | fe531d12acff926628df11df6d476474383a9f3f (diff) | |
staging: comedi: me4000: combine the checks for valid io addresses
Combine the sanity checks for valid io addresses into one if().
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/me4000.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c index f2c8d040f1f8..219ad6c5a174 100644 --- a/drivers/staging/comedi/drivers/me4000.c +++ b/drivers/staging/comedi/drivers/me4000.c @@ -1776,15 +1776,9 @@ static int me4000_attach_pci(struct comedi_device *dev, return result; info->plx_regbase = pci_resource_start(pcidev, 1); - if (!info->plx_regbase) - return -ENODEV; - dev->iobase = pci_resource_start(pcidev, 2); - if (!dev->iobase) - return -ENODEV; - info->timer_regbase = pci_resource_start(pcidev, 3); - if (!info->timer_regbase) + if (!info->plx_regbase || !dev->iobase || !info->timer_regbase) return -ENODEV; dev->irq = pcidev->irq; |