|
@@ -474,19 +474,25 @@ int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
|
|
|
}
|
|
|
EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
|
|
|
|
|
|
-void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
|
|
|
+static void __v4l2_async_notifier_unregister(
|
|
|
+ struct v4l2_async_notifier *notifier)
|
|
|
{
|
|
|
- if (!notifier->v4l2_dev && !notifier->sd)
|
|
|
+ if (!notifier || (!notifier->v4l2_dev && !notifier->sd))
|
|
|
return;
|
|
|
|
|
|
- mutex_lock(&list_lock);
|
|
|
-
|
|
|
v4l2_async_notifier_unbind_all_subdevs(notifier);
|
|
|
|
|
|
notifier->sd = NULL;
|
|
|
notifier->v4l2_dev = NULL;
|
|
|
|
|
|
list_del(¬ifier->list);
|
|
|
+}
|
|
|
+
|
|
|
+void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
|
|
|
+{
|
|
|
+ mutex_lock(&list_lock);
|
|
|
+
|
|
|
+ __v4l2_async_notifier_unregister(notifier);
|
|
|
|
|
|
mutex_unlock(&list_lock);
|
|
|
}
|
|
@@ -596,6 +602,11 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
|
|
|
{
|
|
|
mutex_lock(&list_lock);
|
|
|
|
|
|
+ __v4l2_async_notifier_unregister(sd->subdev_notifier);
|
|
|
+ v4l2_async_notifier_cleanup(sd->subdev_notifier);
|
|
|
+ kfree(sd->subdev_notifier);
|
|
|
+ sd->subdev_notifier = NULL;
|
|
|
+
|
|
|
if (sd->asd) {
|
|
|
struct v4l2_async_notifier *notifier = sd->notifier;
|
|
|
|