X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fmedia%2Fsaa7146.h;fp=include%2Fmedia%2Fsaa7146.h;h=2bc634fcb7bbac85fe6de17b6e45769d3c867147;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=fee579f10b32ad11cd87bca320a6f9f59eefbb43;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git diff --git a/include/media/saa7146.h b/include/media/saa7146.h index fee579f10..2bc634fcb 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -11,8 +11,6 @@ #include /* for i2c subsystem */ #include /* for accessing devices */ #include -#include - #include /* for vmalloc() */ #include /* for vmalloc_to_page() */ @@ -114,7 +112,7 @@ struct saa7146_dev /* different device locks */ spinlock_t slock; - struct mutex lock; + struct semaphore lock; unsigned char __iomem *mem; /* pointer to mapped IO memory */ int revision; /* chip revision; needed for bug-workarounds*/ @@ -135,16 +133,15 @@ struct saa7146_dev void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); /* i2c-stuff */ - struct mutex i2c_lock; - - u32 i2c_bitrate; - struct saa7146_dma d_i2c; /* pointer to i2c memory */ - wait_queue_head_t i2c_wq; - int i2c_op; + struct semaphore i2c_lock; + u32 i2c_bitrate; + struct saa7146_dma d_i2c; /* pointer to i2c memory */ + wait_queue_head_t i2c_wq; + int i2c_op; /* memories */ - struct saa7146_dma d_rps0; - struct saa7146_dma d_rps1; + struct saa7146_dma d_rps0; + struct saa7146_dma d_rps1; }; /* from saa7146_i2c.c */ @@ -153,7 +150,7 @@ int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg *msgs, in /* from saa7146_core.c */ extern struct list_head saa7146_devices; -extern struct mutex saa7146_devices_lock; +extern struct semaphore saa7146_devices_lock; int saa7146_register_extension(struct saa7146_extension*); int saa7146_unregister_extension(struct saa7146_extension*); struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc);