diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-24 15:40:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-24 15:40:19 -0800 |
| commit | 21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d (patch) | |
| tree | 41b584d03391032cc6b1a5dc16b7e876cc8604b6 /drivers/i2c/i2c-dev.c | |
| parent | a792cd12cf07cf77c7d1d41b46b4f8327ecf82d0 (diff) | |
| parent | 531660ef5604c75de6fdead9da1304051af17c09 (diff) | |
| download | kernel-crypto-21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d.tar.gz kernel-crypto-21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d.tar.xz kernel-crypto-21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d.zip | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
Add i2c_board_info for RiscPC PCF8583
i2c: Make sure i2c_algo_bit_data.timeout is HZ-independent
i2c-dev: Clarify the unit of ioctl I2C_TIMEOUT
i2c: Timeouts reach -1
i2c: Fix misplaced parentheses
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index c171988a9f5..7e13d2df9af 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c @@ -35,6 +35,7 @@ #include <linux/i2c.h> #include <linux/i2c-dev.h> #include <linux/smp_lock.h> +#include <linux/jiffies.h> #include <asm/uaccess.h> static struct i2c_driver i2cdev_driver; @@ -422,7 +423,10 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg) client->adapter->retries = arg; break; case I2C_TIMEOUT: - client->adapter->timeout = arg; + /* For historical reasons, user-space sets the timeout + * value in units of 10 ms. + */ + client->adapter->timeout = msecs_to_jiffies(arg * 10); break; default: /* NOTE: returning a fault code here could cause trouble |