git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
[pandora-kernel.git]
/
drivers
/
media
/
video
/
v4l2-int-device.c
diff --git
a/drivers/media/video/v4l2-int-device.c
b/drivers/media/video/v4l2-int-device.c
index
8b4ef53
..
a545dca
100644
(file)
--- 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;
}
}
}