From 398b0af627482f17ee5afe4c4587a1f6e89354e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= Date: Tue, 11 Sep 2012 13:35:09 +0200 Subject: [PATCH] --- yaml --- r: 325177 b: refs/heads/master c: bffe0fd02198fb13586ad4f572c1a028b8547ecd h: refs/heads/master i: 325175: fd29619373c67ddd6baf4cdf06fec676eba5180e v: v3 --- [refs] | 2 +- trunk/drivers/staging/ipack/ipack.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index febd8d678270..e9cdf93118d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 690949e7faaed39300cc618c10a56dec3d1180c3 +refs/heads/master: bffe0fd02198fb13586ad4f572c1a028b8547ecd diff --git a/trunk/drivers/staging/ipack/ipack.c b/trunk/drivers/staging/ipack/ipack.c index 26dc976fdcce..c83f01544206 100644 --- a/trunk/drivers/staging/ipack/ipack.c +++ b/trunk/drivers/staging/ipack/ipack.c @@ -229,8 +229,20 @@ struct ipack_bus_device *ipack_bus_register(struct device *parent, int slots, } EXPORT_SYMBOL_GPL(ipack_bus_register); +static int ipack_unregister_bus_member(struct device *dev, void *data) +{ + struct ipack_device *idev = to_ipack_dev(dev); + struct ipack_bus_device *bus = data; + + if (idev->bus_nr == bus->bus_nr) + ipack_device_unregister(idev); + + return 1; +} + int ipack_bus_unregister(struct ipack_bus_device *bus) { + bus_for_each_dev(&ipack_bus_type, NULL, bus, ipack_unregister_bus_member); ida_simple_remove(&ipack_ida, bus->bus_nr); kfree(bus); return 0;