diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 12:07:19 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 12:07:19 -0200 |
| commit | dc742d4b0ab1ce74bd3bb1c996b132254a8dc052 (patch) | |
| tree | 18213732ca1e2826296ae125dc99d39b3effcbac /linux/drivers/media/video/v4l2-int-device.c | |
| parent | 89a37f5497d1676d989c8c92da8866d5aaff5ee7 (diff) | |
| parent | 9458ed4c0ddff2ee425d54526badcbf3d8753926 (diff) | |
| download | mediapointer-dvb-s2-dc742d4b0ab1ce74bd3bb1c996b132254a8dc052.tar.gz mediapointer-dvb-s2-dc742d4b0ab1ce74bd3bb1c996b132254a8dc052.tar.bz2 | |
merge: http://ifup.org/hg/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/v4l2-int-device.c')
| -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; } } } |