diff options
author | Samuel Iglesias Gonsalvez <siglesias@igalia.com> | 2012-05-25 04:03:05 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-07 01:20:30 -0400 |
commit | 20cf70082440ffabbec5c275726f68fe53872c94 (patch) | |
tree | aae44c0392235ee427d3a29d833d881ec9dc06f1 /drivers/staging/ipack | |
parent | ca2d2bb6618396ec0a79b182fcd1591ef62b07cb (diff) |
Staging: ipack/bridges/tpci200: fix kernel oops when uninstalling a device
When uninstalling a device, the call to the ipack_bus_ops remove() frees
resources in the ipack device driver but without unregistering the device.
It generates a kernel oops when somebody wants to unregister the device.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ipack')
-rw-r--r-- | drivers/staging/ipack/bridges/tpci200.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/staging/ipack/bridges/tpci200.c b/drivers/staging/ipack/bridges/tpci200.c index e04cb8ade9e..46127bca1af 100644 --- a/drivers/staging/ipack/bridges/tpci200.c +++ b/drivers/staging/ipack/bridges/tpci200.c | |||
@@ -751,23 +751,12 @@ out: | |||
751 | return res; | 751 | return res; |
752 | } | 752 | } |
753 | 753 | ||
754 | static void tpci200_slot_remove(struct tpci200_slot *slot) | ||
755 | { | ||
756 | if ((slot->dev == NULL) || | ||
757 | (slot->dev->driver == NULL) || | ||
758 | (slot->dev->driver->ops == NULL) || | ||
759 | (slot->dev->driver->ops->remove == NULL)) | ||
760 | return; | ||
761 | |||
762 | slot->dev->driver->ops->remove(slot->dev); | ||
763 | } | ||
764 | |||
765 | static void tpci200_uninstall(struct tpci200_board *tpci200) | 754 | static void tpci200_uninstall(struct tpci200_board *tpci200) |
766 | { | 755 | { |
767 | int i; | 756 | int i; |
768 | 757 | ||
769 | for (i = 0; i < TPCI200_NB_SLOT; i++) | 758 | for (i = 0; i < TPCI200_NB_SLOT; i++) |
770 | tpci200_slot_remove(&tpci200->slots[i]); | 759 | tpci200_slot_unregister(tpci200->slots[i].dev); |
771 | 760 | ||
772 | tpci200_unregister(tpci200); | 761 | tpci200_unregister(tpci200); |
773 | kfree(tpci200->slots); | 762 | kfree(tpci200->slots); |