Merge branch 'origin'

Conflicts:
	Documentation/video4linux/CARDLIST.cx88
	drivers/media/video/cx88/Kconfig
	drivers/media/video/em28xx/em28xx-video.c
	drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab

1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index 3e5eba9fcacb..c63025a4c861 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -121,14 +121,11 @@ static struct i2c_adapter parport_adapter = {
 
 static int __init i2c_parport_init(void)
 {
-        int type_count;
-
-        type_count = sizeof(adapter_parm)/sizeof(struct adapter_parm);
-        if (type < 0 || type >= type_count) {
+        if (type < 0 || type >= ARRAY_SIZE(adapter_parm)) {
                 printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
                 type = 0;
         }
-        
+
         if (base == 0) {
                 printk(KERN_INFO "i2c-parport: using default base 0x%x\n", DEFAULT_BASE);
                 base = DEFAULT_BASE;
@@ -152,7 +149,7 @@ static int __init i2c_parport_init(void)
                 release_region(base, 3);
                 return -ENODEV;
         }
-        
+
         return 0;
 }