diff -aurN ivtv-0.10.1-orig/driver/ivtv-ioctl.c ivtv-0.10.1/driver/ivtv-ioctl.c
--- ivtv-0.10.1-orig/driver/ivtv-ioctl.c	2007-05-04 13:21:32.000000000 -0500
+++ ivtv-0.10.1/driver/ivtv-ioctl.c	2007-05-04 13:28:57.000000000 -0500
@@ -556,8 +556,8 @@
 	/* ioctls to allow direct access to the encoder registers for testing */
 	case VIDIOC_INT_G_REGISTER:
 		IVTV_DEBUG_IOCTL("VIDIOC_INT_G_REGISTER\n");
-		if (reg->i2c_id)
-			return ivtv_i2c_id(itv, reg->i2c_id, cmd, reg);
+		if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)
+			return ivtv_i2c_id(itv, reg->match_chip, cmd, reg);
 		return ivtv_itvc(itv, cmd, arg);
 
 	case VIDIOC_INT_S_REGISTER:
@@ -566,8 +566,8 @@
 		cmd = VIDIOC_INT_S_REGISTER;
 #endif
 		IVTV_DEBUG_IOCTL("VIDIOC_INT_S_REGISTER\n");
-		if (reg->i2c_id)
-			return ivtv_i2c_id(itv, reg->i2c_id, cmd, reg);
+		if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)
+			return ivtv_i2c_id(itv, reg->match_chip, cmd, reg);
 		return ivtv_itvc(itv, cmd, arg);
 
 	case VIDIOC_INT_S_AUDIO_ROUTING: {
diff -aurN ivtv-0.10.1-orig/i2c-drivers/saa717x.c ivtv-0.10.1/i2c-drivers/saa717x.c
--- ivtv-0.10.1-orig/i2c-drivers/saa717x.c	2007-05-04 13:21:32.000000000 -0500
+++ ivtv-0.10.1/i2c-drivers/saa717x.c	2007-05-04 13:35:56.000000000 -0500
@@ -62,6 +62,11 @@
 #include <linux/i2c.h>
 #include <media/v4l2-common.h>
 
+#ifdef VIDIOC_DBG_S_REGISTER
+#define VIDIOC_INT_S_REGISTER VIDIOC_DBG_S_REGISTER
+#define VIDIOC_INT_G_REGISTER VIDIOC_DBG_G_REGISTER
+#endif
+
 MODULE_DESCRIPTION("Philips SAA717x video decoder driver");
 MODULE_AUTHOR("Kevin Thayer, K. Ohta");
 MODULE_LICENSE("GPL");
@@ -1257,7 +1262,7 @@
 	{
 		struct v4l2_register *reg = arg;
 
-		if (reg->i2c_id != I2C_DRIVERID_SAA717X)
+if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER && reg->match_chip != I2C_DRIVERID_SAA717X)
 			return -EINVAL;
 		reg->val = saa717x_read(client, reg->reg);
 		break;
@@ -1269,7 +1274,7 @@
 		u16 addr = reg->reg & 0xffff;
 		u8 val = reg->val & 0xff;
 
-		if (reg->i2c_id != I2C_DRIVERID_SAA717X)
+		if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER && reg->match_chip != I2C_DRIVERID_SAA717X)
 			return -EINVAL;
 		if (!capable(CAP_SYS_ADMIN))
 			return -EPERM;