OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Sakari Ailus 2007-10-30 05:52:52 -03:00 committed by Mauro Carvalho Chehab
parent 53133afbee
commit 2c94a674e0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/video/v4l2-int-device.c
View File

@ -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;
}
}
}

5
include/media/v4l2-int-device.h
View File

@ -44,9 +44,8 @@ enum v4l2_int_type {
struct v4l2_int_device;
struct v4l2_int_master {
int (*attach)(struct v4l2_int_device *master,
struct v4l2_int_device *slave);
void (*detach)(struct v4l2_int_device *master);
int (*attach)(struct v4l2_int_device *slave);
void (*detach)(struct v4l2_int_device *slave);
};
typedef int (v4l2_int_ioctl_func)(struct v4l2_int_device *);