summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/arch/sh/boards/board-ap325rxa.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/linux/arch/sh/boards/board-ap325rxa.c b/linux/arch/sh/boards/board-ap325rxa.c
index 2a5dded5c..62cec8772 100644
--- a/linux/arch/sh/boards/board-ap325rxa.c
+++ b/linux/arch/sh/boards/board-ap325rxa.c
@@ -326,13 +326,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,
},
};
@@ -349,8 +355,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 */