diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-30 00:18:49 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-30 00:18:49 +0200 |
| commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
| tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /drivers/zorro | |
| parent | [PATCH] libata: add FIXME above ata_dev_xfermask() (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.tar.xz linux-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index fcbee748c592..067c07be928c 100644 --- a/drivers/zorro/zorro-driver.c +++ b/drivers/zorro/zorro-driver.c @@ -65,22 +65,17 @@ static int zorro_device_probe(struct device *dev) * @drv: the driver structure to register * * Adds the driver structure to the list of registered drivers - * Returns the number of Zorro devices which were claimed by the driver - * during registration. The driver remains registered even if the - * return value is zero. + * Returns zero or a negative error value. */ int zorro_register_driver(struct zorro_driver *drv) { - int count = 0; - /* initialize common driver fields */ drv->driver.name = drv->name; drv->driver.bus = &zorro_bus_type; /* register with core */ - count = driver_register(&drv->driver); - return count ? count : 1; + return driver_register(&drv->driver); } |