Merge branch 'next/cleanup' into HEAD

[profile/ivi/kernel-adaptation-intel-automotive.git] / drivers / staging / tidspbridge / core / wdt.c

diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c
index 453ef74..1dce36f 100644 (file)
--- a/drivers/staging/tidspbridge/core/wdt.c
+++ b/drivers/staging/tidspbridge/core/wdt.c
@@ -25,6 +25,7 @@
 #include <dspbridge/host_os.h>
 
 
+#define OMAP34XX_WDT3_BASE             (0x49000000 + 0x30000)
 #define INT_34XX_WDT3_IRQ              (36 + NR_IRQS)
 
 static struct dsp_wdt_setting dsp_wdt;
@@ -61,9 +62,9 @@ int dsp_wdt_init(void)
 
        dsp_wdt.fclk = clk_get(NULL, "wdt3_fck");
 
-       if (dsp_wdt.fclk) {
+       if (!IS_ERR(dsp_wdt.fclk)) {
                dsp_wdt.iclk = clk_get(NULL, "wdt3_ick");
-               if (!dsp_wdt.iclk) {
+               if (IS_ERR(dsp_wdt.iclk)) {
                        clk_put(dsp_wdt.fclk);
                        dsp_wdt.fclk = NULL;
                        ret = -EFAULT;