2 files changed, 5 insertions, 6 deletions

diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/video/v4l2-int-device.c
index 8b4ef530a3a8..a545dcaf857f 100644
--- a/drivers/media/video/v4l2-int-device.c
+++ b/drivers/media/video/v4l2-int-device.c
@@ -57,12 +57,12 @@ static void v4l2_int_device_try_attach_all(void)
                         if (!try_module_get(m->module))
                                 continue;
 
-                        if (m->u.master->attach(m, s)) {
+                        s->u.slave->master = m;
+                        if (m->u.master->attach(s)) {
+                                s->u.slave->master = NULL;
                                 module_put(m->module);
                                 continue;
                         }
-
-                        s->u.slave->master = m;
                 }
         }
 }
diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h
index 066ebfc4f983..c8b80e0f0651 100644
--- a/include/media/v4l2-int-device.h
+++ b/include/media/v4l2-int-device.h
@@ -44,9 +44,8 @@ enum v4l2_int_type {
 struct v4l2_int_device;
 
 struct v4l2_int_master {
-        int (*attach)(struct v4l2_int_device *master,
-                      struct v4l2_int_device *slave);
-        void (*detach)(struct v4l2_int_device *master);
+        int (*attach)(struct v4l2_int_device *slave);
+        void (*detach)(struct v4l2_int_device *slave);
 };
 
 typedef int (v4l2_int_ioctl_func)(struct v4l2_int_device *);