diff options
| author | Johannes Stezenbach <devnull@localhost> | 2005-06-19 13:13:47 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2005-06-19 13:13:47 +0000 |
| commit | a2d6175225f7cb3b83b5d2cf9ca63b349d82ac19 (patch) | |
| tree | 3f3b46324acbc27fedf199e52d7266e14573be9e /linux/drivers/media/common | |
| parent | 48b8b875aba40051bbebae9bee702029bf994c24 (diff) | |
| download | mediapointer-dvb-s2-a2d6175225f7cb3b83b5d2cf9ca63b349d82ac19.tar.gz mediapointer-dvb-s2-a2d6175225f7cb3b83b5d2cf9ca63b349d82ac19.tar.bz2 | |
backport of 2.6.12 changes to match other API changes (i2c, usb)
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_i2c.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/common/saa7146_i2c.c b/linux/drivers/media/common/saa7146_i2c.c index 3e4cfd892..781f23f0c 100644 --- a/linux/drivers/media/common/saa7146_i2c.c +++ b/linux/drivers/media/common/saa7146_i2c.c @@ -25,7 +25,7 @@ static inline u32 saa7146_i2c_status(struct saa7146_dev *dev) sent through the saa7146. have a look at the specifications p. 122 ff to understand this. it returns the number of u32s to send, or -1 in case of an error. */ -static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op) +static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, u32 *op) { int h1, h2; int i, j, addr; @@ -89,7 +89,7 @@ static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op) which bytes were read through the adapter and write them back to the corresponding i2c-message. but instead, we simply write back all bytes. fixme: this could be improved. */ -static int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op) +static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, u32 *op) { int i, j; int op_count = 0; @@ -272,7 +272,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, u32* dword, int short_d return 0; } -int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg msgs[], int num, int retries) +int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries) { int i = 0, count = 0; u32* buffer = dev->d_i2c.cpu_addr; @@ -372,7 +372,7 @@ out: } /* utility functions */ -static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num) +static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num) { struct saa7146_dev* dev = i2c_get_adapdata(adapter); diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 397b01d1c..1bb0c159c 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -889,7 +889,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int strcpy(cap->driver, "saa7146 v4l2"); strlcpy(cap->card, dev->ext->name, sizeof(cap->card)); - sprintf(cap->bus_info,"PCI:%s",dev->pci->slot_name); + sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); cap->version = SAA7146_VERSION_CODE; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | |