2 files changed, 12 insertions, 24 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5e58b5641a35..e73d58c43f38 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -931,28 +931,6 @@ int i2c_master_recv(struct i2c_client *client, char *buf ,int count)
 }
 EXPORT_SYMBOL(i2c_master_recv);
 
-int i2c_control(struct i2c_client *client,
-        unsigned int cmd, unsigned long arg)
-{
-        int ret = 0;
-        struct i2c_adapter *adap = client->adapter;
-
-        dev_dbg(&client->adapter->dev, "i2c ioctl, cmd: 0x%x, arg: %#lx\n", cmd, arg);
-        switch (cmd) {
-                case I2C_RETRIES:
-                        adap->retries = arg;
-                        break;
-                case I2C_TIMEOUT:
-                        adap->timeout = arg;
-                        break;
-                default:
-                        if (adap->algo->algo_control!=NULL)
-                                ret = adap->algo->algo_control(adap,cmd,arg);
-        }
-        return ret;
-}
-EXPORT_SYMBOL(i2c_control);
-
 /* ----------------------------------------------------
  * the i2c address scanning function
  * Will not work for 10-bit addresses!
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index df6e14c192d6..5a15e50748de 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -354,9 +354,19 @@ static int i2cdev_ioctl(struct inode *inode, struct file *file,
                                 return -EFAULT;
                 }
                 return res;
-
+        case I2C_RETRIES:
+                client->adapter->retries = arg;
+                break;
+        case I2C_TIMEOUT:
+                client->adapter->timeout = arg;
+                break;
         default:
-                return i2c_control(client,cmd,arg);
+                /* NOTE:  returning a fault code here could cause trouble
+                 * in buggy userspace code.  Some old kernel bugs returned
+                 * zero in this case, and userspace code might accidentally
+                 * have depended on that bug.
+                 */
+                return -ENOTTY;
         }
         return 0;
 }