Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74033
b: refs/heads/master
c: 2f9b0b5
h: refs/heads/master
i:
  74031: f88b5ae
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Nov 27, 2007
1 parent c6d7430 commit bf3a970
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9e893bb8530d9c09b1eb8da8734eebf4182bb8b7
refs/heads/master: 2f9b0b5e46f0381fd41af8cb9ed4daffee59d4f3
15 changes: 15 additions & 0 deletions trunk/drivers/zorro/zorro-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ static int zorro_device_probe(struct device *dev)
}


static int zorro_device_remove(struct device *dev)
{
struct zorro_dev *z = to_zorro_dev(dev);
struct zorro_driver *drv = to_zorro_driver(dev->driver);

if (drv) {
if (drv->remove)
drv->remove(z);
z->driver = NULL;
}
return 0;
}


/**
* zorro_register_driver - register a new Zorro driver
* @drv: the driver structure to register
Expand Down Expand Up @@ -128,6 +142,7 @@ struct bus_type zorro_bus_type = {
.name = "zorro",
.match = zorro_bus_match,
.probe = zorro_device_probe,
.remove = zorro_device_remove,
};


Expand Down

0 comments on commit bf3a970

Please sign in to comment.