diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-30 10:52:52 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-30 10:52:52 +0200 |
| commit | 48367f67743ac8d9ec4f445d6e8ef253467195cf (patch) | |
| tree | e699d5ddf4f7ae47be85fa477dacbfaee4255a1c /linux/drivers/media | |
| parent | bbc69668d941b41331987a3c309d1174a03a554b (diff) | |
| download | mediapointer-dvb-s2-48367f67743ac8d9ec4f445d6e8ef253467195cf.tar.gz mediapointer-dvb-s2-48367f67743ac8d9ec4f445d6e8ef253467195cf.tar.bz2 | |
V4L: Int if: Set slave's master before attach, remove master argument
From: Sakari Ailus <sakari.ailus@nokia.com>
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 <sakari.ailus@nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/v4l2-int-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } } } |