V4L/DVB (6580): Set slave's master before master's attach call.

V4L: Int if: Set slave's master before attach, remove master argument

The master also now gets its own pointer from slave's structure.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 3 insertions, 3 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;
                 }
         }
 }