diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 19:12:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-28 19:12:40 -0300 |
| commit | a129f886d7e7b8e23e339f6ab8065cbf19a7c7cc (patch) | |
| tree | c14462b96f6bc0cb6db29f306a27fcc640f62812 /linux/include/media | |
| parent | db70e703e55d87b3659e6fb511b201b6d725e737 (diff) | |
| parent | 157f8eb764c03a0d74db15db98790bca85d5f9dd (diff) | |
| download | mediapointer-dvb-s2-a129f886d7e7b8e23e339f6ab8065cbf19a7c7cc.tar.gz mediapointer-dvb-s2-a129f886d7e7b8e23e339f6ab8065cbf19a7c7cc.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/soc_camera.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 37013688a..bef5e81d6 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -60,7 +60,7 @@ struct soc_camera_file { struct soc_camera_host { struct list_head list; - struct device dev; + struct device *dev; unsigned char nr; /* Host number */ void *priv; const char *drv_name; @@ -107,6 +107,7 @@ struct soc_camera_link { */ int (*set_bus_param)(struct soc_camera_link *, unsigned long flags); unsigned long (*query_bus_param)(struct soc_camera_link *); + void (*free_bus)(struct soc_camera_link *); }; static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev) @@ -116,7 +117,7 @@ static inline struct soc_camera_device *to_soc_camera_dev(struct device *dev) static inline struct soc_camera_host *to_soc_camera_host(struct device *dev) { - return container_of(dev, struct soc_camera_host, dev); + return dev_get_drvdata(dev); } extern int soc_camera_host_register(struct soc_camera_host *ici); |