diff options
Diffstat (limited to 'drivers/zorro')
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index ab06c9ce2c78..96f068830549 100644 --- a/drivers/zorro/zorro-driver.c +++ b/drivers/zorro/zorro-driver.c @@ -47,16 +47,14 @@ static int zorro_device_probe(struct device *dev) struct zorro_driver *drv = to_zorro_driver(dev->driver); struct zorro_dev *z = to_zorro_dev(dev); - if (!z->driver && drv->probe) { + if (drv->probe) { const struct zorro_device_id *id; id = zorro_match_device(drv->id_table, z); if (id) error = drv->probe(z, id); - if (error >= 0) { - z->driver = drv; + if (error >= 0) error = 0; - } } return error; } @@ -69,7 +67,6 @@ static void zorro_device_remove(struct device *dev) if (drv->remove) drv->remove(z); - z->driver = NULL; } |