diff options
| author | Sakari Ailus <sakari.ailus@nokia.com> | 2007-10-30 05:52:52 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 19:02:06 -0200 |
| commit | 2c94a674e059e89252d58da655efa4e798be4d48 (patch) | |
| tree | 425261eec62e6739765d425e237dbcdaedeac64b /drivers/media/video/v4l2-int-device.c | |
| parent | 53133afbeeb177487a907fdc2edf18f857497641 (diff) | |
| download | linux-2c94a674e059e89252d58da655efa4e798be4d48.tar.bz2 | |
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>
Diffstat (limited to 'drivers/media/video/v4l2-int-device.c')
| -rw-r--r-- | drivers/media/video/v4l2-int-device.c | 6 |
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; } } } |