From dffe9afaabd4c5c3aded53705d5421201d80dc74 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 5 Feb 2008 22:41:54 -0200 Subject: Fix BUG in changeset 7157 From: e9hack compiling of the current HG tree fails on linux 2.6.24. I think it is a bug in changeset 7157: The definition of i2c_verify_client() should not be inside #ifndef BIT_MASK / #endif. The variable i2c_bus_type is only public on 2.6.23.x (maybe also on earlier versions) but not on 2.6.24. The following patch does fix the problem on 2.6.24 for me: Signed-off-by: Mauro Carvalho Chehab --- v4l/compat.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'v4l') diff --git a/v4l/compat.h b/v4l/compat.h index 16a6d03b4..581262bdf 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -497,13 +497,16 @@ do { \ #ifndef BIT_MASK # define BIT_MASK(nr) (1UL << ((nr) % BITS_PER_LONG)) # define BIT_WORD(nr) ((nr) / BITS_PER_LONG) +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) #define i2c_verify_client(dev) \ ((dev->bus == &i2c_bus_type) ? to_i2c_client(dev) : NULL) - +#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +#define i2c_verify_client(dev) \ + ((dev->bus && 0 == strcmp(dev->bus->name, "i2c")) ? to_i2c_client(dev) : NULL) #endif - #ifndef USB_DEVICE_AND_INTERFACE_INFO # define USB_DEVICE_AND_INTERFACE_INFO(vend,prod,cl,sc,pr) \ .match_flags = USB_DEVICE_ID_MATCH_INT_INFO \ -- cgit v1.2.3