diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2010-04-04 16:04:16 +0200 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-05-22 14:19:15 -0400 |
| commit | efc5863eb52a04134869f5ceb5f81a6fe9b47469 (patch) | |
| tree | e6f057b7818a0a883ba5f0541e1796928858b3ff /arch/blackfin | |
| parent | d016a21362194826518d4ac9ca3f768d0345cd2c (diff) | |
| download | op-kernel-dev-efc5863eb52a04134869f5ceb5f81a6fe9b47469.zip op-kernel-dev-efc5863eb52a04134869f5ceb5f81a6fe9b47469.tar.gz | |
Blackfin: acvilon: fix timeout usage for I2C
The timeout value is in jiffies, so it should be using HZ, not a plain
number. As '10000' is ambiguous, 1HZ is used as conservative default.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Valentin Yakovenkov <yakovenkov@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
| -rw-r--r-- | arch/blackfin/mach-bf561/boards/acvilon.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c index 5163e2c..bfcfa86 100644 --- a/arch/blackfin/mach-bf561/boards/acvilon.c +++ b/arch/blackfin/mach-bf561/boards/acvilon.c @@ -44,6 +44,7 @@ #include <linux/spi/flash.h> #include <linux/irq.h> #include <linux/interrupt.h> +#include <linux/jiffies.h> #include <linux/i2c-pca-platform.h> #include <linux/delay.h> #include <linux/io.h> @@ -112,7 +113,7 @@ static struct resource bfin_i2c_pca_resources[] = { struct i2c_pca9564_pf_platform_data pca9564_platform_data = { .gpio = -1, .i2c_clock_speed = 330000, - .timeout = 10000 + .timeout = HZ, }; /* PCA9564 I2C Bus driver */ |
