diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:26:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:26:08 -0400 |
| commit | 3539fc544f39017cf3403b9319fb4d74b5116135 (patch) | |
| tree | d2bcf279d54a78479ffeb3549d8b3c45de6704e1 /drivers/watchdog/of_xilinx_wdt.c | |
| parent | 2b849570264d9f802485e327b7a4b0c52991d26a (diff) | |
| parent | 0dd6e4847ed8a42e81df6ffaa71129245a6d9d72 (diff) | |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog changes from Wim Van Sebroeck:
- conversion of iTCO_wdt and orion_wdt to the generic watchdog API
- uses module_platform_driver() for s3c2410_wdt
- Adds support for Jetway JNF99 Motherboard
- various fixes
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: orion_wdt: Convert driver to watchdog core
watchdog: s3c2410_wdt: Use module_platform_driver()
watchdog: sch311x_wdt: Fix Polarity when starting watchdog
Watchdog: OMAP: Fix the runtime pm code to avoid module getting stuck intransition state.
watchdog: ie6xx_wdt: section mismatch in ie6xx_wdt_probe()
watchdog: bcm63xx_wdt: fix driver section mismatch
watchdog: iTCO_wdt.c: convert to watchdog core
char/ipmi: remove local ioctl defines replaced by generic ones
watchdog: xilinx: Read clock frequency directly from DT node
watchdog: coh901327_wdt: use clk_prepare/unprepare
watchdog: f71808e_wdt: Add support for Jetway JNF99 motherboard
Diffstat (limited to 'drivers/watchdog/of_xilinx_wdt.c')
| -rw-r--r-- | drivers/watchdog/of_xilinx_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index 55d2f66dbeae..294fb4e00521 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c | |||
| @@ -297,7 +297,7 @@ static int __devinit xwdt_probe(struct platform_device *pdev) | |||
| 297 | 297 | ||
| 298 | no_timeout = 0; | 298 | no_timeout = 0; |
| 299 | 299 | ||
| 300 | pfreq = (u32 *)of_get_property(pdev->dev.of_node->parent, | 300 | pfreq = (u32 *)of_get_property(pdev->dev.of_node, |
| 301 | "clock-frequency", NULL); | 301 | "clock-frequency", NULL); |
| 302 | 302 | ||
| 303 | if (pfreq == NULL) { | 303 | if (pfreq == NULL) { |