From 48367f67743ac8d9ec4f445d6e8ef253467195cf Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 30 Oct 2007 10:52:52 +0200 Subject: V4L: Int if: Set slave's master before attach, remove master argument From: Sakari Ailus Set slave's master before master's attach call. The master also now gets its own pointer from slave's structure. Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/v4l2-int-device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/v4l2-int-device.c b/linux/drivers/media/video/v4l2-int-device.c index 42db79763..f5e58640f 100644 --- a/linux/drivers/media/video/v4l2-int-device.c +++ b/linux/drivers/media/video/v4l2-int-device.c @@ -58,12 +58,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; } } } -- cgit v1.2.3