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 /include | |
| parent | 53133afbeeb177487a907fdc2edf18f857497641 (diff) | |
| download | linux-3.10-2c94a674e059e89252d58da655efa4e798be4d48.tar.gz linux-3.10-2c94a674e059e89252d58da655efa4e798be4d48.tar.bz2 linux-3.10-2c94a674e059e89252d58da655efa4e798be4d48.zip | |
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 'include')
| -rw-r--r-- | include/media/v4l2-int-device.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/media/v4l2-int-device.h b/include/media/v4l2-int-device.h index 066ebfc4f98..c8b80e0f065 100644 --- a/include/media/v4l2-int-device.h +++ b/include/media/v4l2-int-device.h @@ -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 *); |