diff options
| author | Greg Kroah-Hartman | 2013-01-08 00:17:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-08 00:17:52 +0100 |
| commit | 17cb3be61b45d716f6b21a9380925493413ce0ed (patch) | |
| tree | d29ca8bc010a22f358032346d7e7b6887c455e08 /drivers/staging/vme/devices | |
| parent | staging: android: Add some Kconfig help entries (diff) | |
| parent | staging: tidspbridge: use prepare/unprepare on dsp clocks (diff) | |
| download | kernel-qcow2-linux-17cb3be61b45d716f6b21a9380925493413ce0ed.tar.gz kernel-qcow2-linux-17cb3be61b45d716f6b21a9380925493413ce0ed.tar.xz kernel-qcow2-linux-17cb3be61b45d716f6b21a9380925493413ce0ed.zip | |
Merge branch 'staging-linus' into staging-next
This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.
It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vme/devices')
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2_core.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c index 0331178ca3b3..bf73ba26e88a 100644 --- a/drivers/staging/vme/devices/vme_pio2_core.c +++ b/drivers/staging/vme/devices/vme_pio2_core.c @@ -162,11 +162,9 @@ static struct vme_driver pio2_driver = { static int __init pio2_init(void) { - int retval = 0; - if (bus_num == 0) { pr_err("No cards, skipping registration\n"); - goto err_nocard; + return -ENODEV; } if (bus_num > PIO2_CARDS_MAX) { @@ -176,15 +174,7 @@ static int __init pio2_init(void) } /* Register the PIO2 driver */ - retval = vme_register_driver(&pio2_driver, bus_num); - if (retval != 0) - goto err_reg; - - return retval; - -err_reg: -err_nocard: - return retval; + return vme_register_driver(&pio2_driver, bus_num); } static int pio2_match(struct vme_dev *vdev) |