From 0ed722390b72fab864aac23e3104f592887cdc29 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 17 Sep 2012 13:26:00 +0100 Subject: [PATCH] --- yaml --- r: 325369 b: refs/heads/master c: 37812d2e10e5790f3cc3319055aac0647080c4af h: refs/heads/master i: 325367: a3a689cb01a7e56f519cd4381d9584600b7bc76d v: v3 --- [refs] | 2 +- .../drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3399ea59cb73..030d6538deb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0e545e0e75006a7de0e9bc5397f6b44c61990b2 +refs/heads/master: 37812d2e10e5790f3cc3319055aac0647080c4af diff --git a/trunk/drivers/staging/iio/trigger/iio-trig-bfin-timer.c b/trunk/drivers/staging/iio/trigger/iio-trig-bfin-timer.c index ce6a7b1b8860..2772ea2fb0dc 100644 --- a/trunk/drivers/staging/iio/trigger/iio-trig-bfin-timer.c +++ b/trunk/drivers/staging/iio/trigger/iio-trig-bfin-timer.c @@ -99,9 +99,15 @@ static ssize_t iio_bfin_tmr_frequency_show(struct device *dev, { struct iio_trigger *trig = to_iio_trigger(dev); struct bfin_tmr_state *st = trig->private_data; + unsigned int period = get_gptimer_period(st->t->id); + unsigned long val; - return sprintf(buf, "%lu\n", - get_sclk() / get_gptimer_period(st->t->id)); + if (period == 0) + val = 0; + else + val = get_sclk() / get_gptimer_period(st->t->id); + + return sprintf(buf, "%lu\n", val); } static DEVICE_ATTR(frequency, S_IRUGO | S_IWUSR, iio_bfin_tmr_frequency_show,