We will be registering and unregistering the soc_camera_platform platform
device multiple times, therefore we need a .release() method and have to
nullify the kobj.

Signed-off-by: Guennadi Liakhovetski <g.liakhovet...@gmx.de>
---

Another one for "sh". Again have to synchronise.

 arch/sh/boards/board-ap325rxa.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index f644ad7..9329fe5 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -323,13 +323,19 @@ static struct soc_camera_platform_info camera_info = {
                .bus_id         = 0,
                .add_device     = ap325rxa_camera_add,
                .del_device     = ap325rxa_camera_del,
+               .module_name    = "soc_camera_platform",
        },
 };
 
+static void dummy_release(struct device *dev)
+{
+}
+
 static struct platform_device camera_device = {
        .name           = "soc_camera_platform",
        .dev            = {
                .platform_data  = &camera_info,
+               .release        = dummy_release,
        },
 };
 
@@ -346,8 +352,11 @@ static int ap325rxa_camera_add(struct soc_camera_link *icl,
 
 static void ap325rxa_camera_del(struct soc_camera_link *icl)
 {
-       if (icl == &camera_info.link)
-               platform_device_unregister(&camera_device);
+       if (icl != &camera_info.link)
+               return;
+
+       platform_device_unregister(&camera_device);
+       memset(&migor_camera_device.dev.kobj, 0, 
sizeof(migor_camera_device.dev.kobj));
 }
 #endif /* CONFIG_I2C */
 
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to