From: Ladislav Michl <ladis@linux-mips.org>
To: Keerthy <j-keerthy@ti.com>
Cc: daniel.lezcano@linaro.org, tony@atomide.com,
aaro.koskinen@iki.fi, thierry.reding@gmail.com,
grygorii.strashko@ti.com, linux-omap@vger.kernel.org,
robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-pwm@vger.kernel.org, sebastian.reichel@collabora.co.uk,
linux-kernel@vger.kernel.org, t-kristo@ti.com,
linux@armlinux.org.uk
Subject: [PATCH 2/2] clocksource: timer-dm: Check prescaler value
Date: Mon, 18 Dec 2017 12:31:53 +0100 [thread overview]
Message-ID: <20171218113153.GB18637@lenoch> (raw)
In-Reply-To: <20171218111610.GA16906@lenoch>
Invalid prescaler value is silently ignored. Fix that
by returning -EINVAL in such case. As invalid value
disabled use of the prescaler, use -1 explicitely for
that purpose.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
drivers/clocksource/timer-dm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
index ec3a28c90c70..95cd98be8541 100644
--- a/drivers/clocksource/timer-dm.c
+++ b/drivers/clocksource/timer-dm.c
@@ -609,6 +609,9 @@ static int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer,
if (prescaler >= 0x00 && prescaler <= 0x07) {
l |= OMAP_TIMER_CTRL_PRE;
l |= prescaler << 2;
+ } else {
+ if (prescaler != -1)
+ return -EINVAL;
}
omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
--
2.15.1
WARNING: multiple messages have this Message-ID (diff)
From: ladis@linux-mips.org (Ladislav Michl)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] clocksource: timer-dm: Check prescaler value
Date: Mon, 18 Dec 2017 12:31:53 +0100 [thread overview]
Message-ID: <20171218113153.GB18637@lenoch> (raw)
In-Reply-To: <20171218111610.GA16906@lenoch>
Invalid prescaler value is silently ignored. Fix that
by returning -EINVAL in such case. As invalid value
disabled use of the prescaler, use -1 explicitely for
that purpose.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
drivers/clocksource/timer-dm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/clocksource/timer-dm.c b/drivers/clocksource/timer-dm.c
index ec3a28c90c70..95cd98be8541 100644
--- a/drivers/clocksource/timer-dm.c
+++ b/drivers/clocksource/timer-dm.c
@@ -609,6 +609,9 @@ static int omap_dm_timer_set_prescaler(struct omap_dm_timer *timer,
if (prescaler >= 0x00 && prescaler <= 0x07) {
l |= OMAP_TIMER_CTRL_PRE;
l |= prescaler << 2;
+ } else {
+ if (prescaler != -1)
+ return -EINVAL;
}
omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
--
2.15.1
next prev parent reply other threads:[~2017-12-18 11:31 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-12 6:12 [PATCH v5 0/8] omap: dmtimer: Move driver out of plat-omap Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` [PATCH v5 1/8] clocksource: dmtimer: Remove all the exports Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 7:16 ` Ladislav Michl
2017-12-12 7:16 ` Ladislav Michl
2017-12-12 7:31 ` Keerthy
2017-12-12 7:31 ` Keerthy
2017-12-12 7:31 ` Keerthy
2017-12-12 8:01 ` Ladislav Michl
2017-12-12 8:01 ` Ladislav Michl
2017-12-12 8:08 ` Keerthy
2017-12-12 8:08 ` Keerthy
2017-12-12 8:08 ` Keerthy
2017-12-12 8:19 ` Ladislav Michl
2017-12-12 8:19 ` Ladislav Michl
2017-12-12 8:22 ` Keerthy
2017-12-12 8:22 ` Keerthy
2017-12-12 8:22 ` Keerthy
2017-12-12 17:00 ` Tony Lindgren
2017-12-12 17:00 ` Tony Lindgren
2017-12-12 18:03 ` Ladislav Michl
2017-12-12 18:03 ` Ladislav Michl
2017-12-12 18:21 ` Tony Lindgren
2017-12-12 18:21 ` Tony Lindgren
2017-12-13 9:15 ` Ladislav Michl
2017-12-13 9:15 ` Ladislav Michl
2017-12-13 16:51 ` Tony Lindgren
2017-12-13 16:51 ` Tony Lindgren
2017-12-12 6:12 ` [PATCH v5 2/8] arm: omap: timer: Wrap the inline functions under OMAP2PLUS define Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` [PATCH v5 3/8] arm: omap: Move dmtimer.h out of plat-omap Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` [PATCH v5 4/8] arm: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` [PATCH v5 5/8] dmtimer: Add timer ops to the platform data structure Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` [PATCH v5 6/8] clocksource: dmtimer: Populate the timer ops to the pdata Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` [PATCH v5 7/8] pwm: pwm-omap-dmtimer: Adapt driver to utilize dmtimer pdata ops Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-18 9:31 ` Ladislav Michl
2017-12-18 9:31 ` Ladislav Michl
2017-12-18 12:55 ` Keerthy
2017-12-18 12:55 ` Keerthy
2017-12-18 12:55 ` Keerthy
2017-12-19 4:58 ` Keerthy
2017-12-19 4:58 ` Keerthy
2017-12-19 4:58 ` Keerthy
2017-12-19 8:25 ` Keerthy
2017-12-19 8:25 ` Keerthy
2017-12-19 8:25 ` Keerthy
2017-12-19 15:21 ` Ladislav Michl
2017-12-19 15:21 ` Ladislav Michl
2017-12-20 4:42 ` Keerthy
2017-12-20 4:42 ` Keerthy
2017-12-20 4:42 ` Keerthy
2017-12-12 6:12 ` [PATCH v5 8/8] arm: omap: pdata-quirks: Remove unused timer pdata Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-12 6:12 ` Keerthy
2017-12-18 11:16 ` [PATCH v5 0/8] omap: dmtimer: Move driver out of plat-omap Ladislav Michl
2017-12-18 11:16 ` Ladislav Michl
2017-12-18 11:30 ` [PATCH 1/2] clocksource: timer-dm: Make unexported functions static Ladislav Michl
2017-12-18 11:30 ` Ladislav Michl
2017-12-19 8:33 ` Keerthy
2017-12-19 8:33 ` Keerthy
2017-12-19 8:33 ` Keerthy
2017-12-18 11:31 ` Ladislav Michl [this message]
2017-12-18 11:31 ` [PATCH 2/2] clocksource: timer-dm: Check prescaler value Ladislav Michl
2017-12-19 8:30 ` Keerthy
2017-12-19 8:30 ` Keerthy
2017-12-19 8:30 ` Keerthy
2017-12-18 12:54 ` [PATCH v5 0/8] omap: dmtimer: Move driver out of plat-omap Keerthy
2017-12-18 12:54 ` Keerthy
2017-12-18 12:54 ` Keerthy
2017-12-18 13:14 ` Ladislav Michl
2017-12-18 13:14 ` Ladislav Michl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171218113153.GB18637@lenoch \
--to=ladis@linux-mips.org \
--cc=aaro.koskinen@iki.fi \
--cc=daniel.lezcano@linaro.org \
--cc=grygorii.strashko@ti.com \
--cc=j-keerthy@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=sebastian.reichel@collabora.co.uk \
--cc=t-kristo@ti.com \
--cc=thierry.reding@gmail.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.