From c5342d38eaad6fbf510c2c873116638db8e1b2a0 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Thu, 5 Jul 2007 13:53:39 -0700 Subject: v4l2: Update v4l_printk_ioctl_arg From: Trent Piepho v4l_printk_ioctl_arg() is a debug printing function that is normally disabled. It was out of date with one ioctl and had a couple bugs in it elsewhere. This patch gets it in a state where it will work correctly, if it was enabled and used. Signed-off-by: Trent Piepho --- linux/include/media/v4l2-common.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linux/include/media') diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 579835f92..3f6e53f72 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -69,6 +69,9 @@ /* Prints the ioctl in a human-readable format */ extern void v4l_printk_ioctl(unsigned int cmd); +#if 0 +extern void v4l_printk_ioctl_arg(const char *s, unsigned int cmd, const void *arg); +#endif /* Use this macro for non-I2C drivers. Pass the driver name as the first arg. */ #define v4l_print_ioctl(name, cmd) \ -- cgit v1.2.3 From 985b5941a23fb7352d5b27fab4b5beaf12dc0d3b Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Fri, 13 Jul 2007 01:37:50 +0200 Subject: saa7146/dvb-ttpci: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22) From: Oliver Endriss Fix signedness warnings (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss --- linux/include/media/saa7146.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/include/media') diff --git a/linux/include/media/saa7146.h b/linux/include/media/saa7146.h index 1904940e3..ffc67e4b8 100644 --- a/linux/include/media/saa7146.h +++ b/linux/include/media/saa7146.h @@ -130,7 +130,7 @@ struct saa7146_dev #endif unsigned char __iomem *mem; /* pointer to mapped IO memory */ - int revision; /* chip revision; needed for bug-workarounds*/ + u32 revision; /* chip revision; needed for bug-workarounds*/ /* pci-device & irq stuff*/ char name[32]; @@ -181,8 +181,8 @@ struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc); int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt); void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt); int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt, struct scatterlist *list, int length ); -char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt); -void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt); +void *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt); +void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, void *mem, struct saa7146_pgtable *pt); void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data); int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop); -- cgit v1.2.3