diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-30 10:52:52 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-30 10:52:52 +0200 |
| commit | 48367f67743ac8d9ec4f445d6e8ef253467195cf (patch) | |
| tree | e699d5ddf4f7ae47be85fa477dacbfaee4255a1c /linux/include/media/v4l2-int-device.h | |
| parent | bbc69668d941b41331987a3c309d1174a03a554b (diff) | |
| download | mediapointer-dvb-s2-48367f67743ac8d9ec4f445d6e8ef253467195cf.tar.gz mediapointer-dvb-s2-48367f67743ac8d9ec4f445d6e8ef253467195cf.tar.bz2 | |
V4L: Int if: Set slave's master before attach, remove master argument
From: Sakari Ailus <sakari.ailus@nokia.com>
Set slave's master before master's attach call.
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 'linux/include/media/v4l2-int-device.h')
| -rw-r--r-- | linux/include/media/v4l2-int-device.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux/include/media/v4l2-int-device.h b/linux/include/media/v4l2-int-device.h index 066ebfc4f..c8b80e0f0 100644 --- a/linux/include/media/v4l2-int-device.h +++ b/linux/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 *); |