summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-kempld.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-08-11 12:10:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-08-11 12:10:47 -0700
commit9e6bdaaaa53efb9ab03bdd0229fb09180ef65825 (patch)
tree2c87799c615a7059f97f81a3b9a09e1557f9119c /drivers/i2c/busses/i2c-kempld.c
parentd92581fcad188d38a5c82c01ace43623bcafea48 (diff)
parentf480adaf1b7130ad43760f627b762f771fcfc5f5 (diff)
downloadlinux-9e6bdaaaa53efb9ab03bdd0229fb09180ef65825.tar.gz
linux-9e6bdaaaa53efb9ab03bdd0229fb09180ef65825.tar.bz2
linux-9e6bdaaaa53efb9ab03bdd0229fb09180ef65825.zip
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang: "Some driver bugfixes for the I2C subsystem" * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: mv64xxx: Document the newly introduced allwinner compatible i2c: Fix Kontron PLD prescaler calculation i2c: i2c-mxs: Use DMA mode even for small transfers
Diffstat (limited to 'drivers/i2c/busses/i2c-kempld.c')
-rw-r--r--drivers/i2c/busses/i2c-kempld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c
index ccec916bc3eb..af8f65fb1c05 100644
--- a/drivers/i2c/busses/i2c-kempld.c
+++ b/drivers/i2c/busses/i2c-kempld.c
@@ -246,9 +246,9 @@ static void kempld_i2c_device_init(struct kempld_i2c_data *i2c)
bus_frequency = KEMPLD_I2C_FREQ_MAX;
if (pld->info.spec_major == 1)
- prescale = pld->pld_clock / bus_frequency * 5 - 1000;
+ prescale = pld->pld_clock / (bus_frequency * 5) - 1000;
else
- prescale = pld->pld_clock / bus_frequency * 4 - 3000;
+ prescale = pld->pld_clock / (bus_frequency * 4) - 3000;
if (prescale < 0)
prescale = 0;