diff options
author | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
commit | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (patch) | |
tree | e9fc247ed3a26f5369a7ec1b1bd0ef66bda7b4dd /drivers/i2c/busses/i2c-kempld.c | |
parent | eb91626ac4b9af3d5602a7db888b8bc4cb23eb3b (diff) | |
parent | 63b66e5ba54b15a6592be00555d762db6db739ce (diff) | |
download | blackbird-op-linux-3387ed83943daf6cb1bb4195ae369067b9cd80ce.tar.gz blackbird-op-linux-3387ed83943daf6cb1bb4195ae369067b9cd80ce.zip |
Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel
* tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel: (153 commits)
drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
Diffstat (limited to 'drivers/i2c/busses/i2c-kempld.c')
-rw-r--r-- | drivers/i2c/busses/i2c-kempld.c | 4 |
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; |