aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-23 19:16:57 +0900
committerWim Van Sebroeck <wim@iguana.be>2013-10-13 20:01:57 +0200
commit4c4e45669de475573b15d968a6dca8d00124c9ad (patch)
tree8a130de54ec83c58335679853b1f203992efdcb4 /drivers/watchdog
parent8612ed0d97abcf1c016d34755b7cf2060de71963 (diff)
downloadkernel_goldelico_gta04-4c4e45669de475573b15d968a6dca8d00124c9ad.zip
kernel_goldelico_gta04-4c4e45669de475573b15d968a6dca8d00124c9ad.tar.gz
kernel_goldelico_gta04-4c4e45669de475573b15d968a6dca8d00124c9ad.tar.bz2
watchdog: kempld_wdt: Fix bit mask definition
STAGE_CFG bits are defined as [5:4] bits. However, '(((x) & 0x30) << 4)' handles [9:8] bits. Thus, it should be fixed in order to handle [5:4] bits. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/kempld_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/kempld_wdt.c b/drivers/watchdog/kempld_wdt.c
index 491419e..5c3d4df 100644
--- a/drivers/watchdog/kempld_wdt.c
+++ b/drivers/watchdog/kempld_wdt.c
@@ -35,7 +35,7 @@
#define KEMPLD_WDT_STAGE_TIMEOUT(x) (0x1b + (x) * 4)
#define KEMPLD_WDT_STAGE_CFG(x) (0x18 + (x))
#define STAGE_CFG_GET_PRESCALER(x) (((x) & 0x30) >> 4)
-#define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x30) << 4)
+#define STAGE_CFG_SET_PRESCALER(x) (((x) & 0x3) << 4)
#define STAGE_CFG_PRESCALER_MASK 0x30
#define STAGE_CFG_ACTION_MASK 0x7
#define STAGE_CFG_ASSERT (1 << 3)