diff --git a/[refs] b/[refs]
index 8557daf270b0..ee97d7be9b75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 813e30e9ab917f5493147451cfdbf6356a3dcee0
+refs/heads/master: 2c003e8e1c0c241aec162ba9ec781089c5b2ff3f
diff --git a/trunk/drivers/i2c/i2c-dev.c b/trunk/drivers/i2c/i2c-dev.c
index 2e22a2ffa606..d66cefc63df7 100644
--- a/trunk/drivers/i2c/i2c-dev.c
+++ b/trunk/drivers/i2c/i2c-dev.c
@@ -193,8 +193,7 @@ static int i2cdev_ioctl(struct inode *inode, struct file *file,
 		return 0;
 	case I2C_FUNCS:
 		funcs = i2c_get_functionality(client->adapter);
-		return (copy_to_user((unsigned long __user *)arg, &funcs,
-		                     sizeof(unsigned long)))?-EFAULT:0;
+		return put_user(funcs, (unsigned long __user *)arg);
 
 	case I2C_RDWR:
 		if (copy_from_user(&rdwr_arg,