aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-omap/include/syslink/ipc.h3
-rw-r--r--drivers/dsp/syslink/devh/44xx/devh44xx.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/include/syslink/ipc.h b/arch/arm/plat-omap/include/syslink/ipc.h
index ceb239219b7..14ac732d002 100644
--- a/arch/arm/plat-omap/include/syslink/ipc.h
+++ b/arch/arm/plat-omap/include/syslink/ipc.h
@@ -181,9 +181,8 @@ int ipc_unregister_notifier(struct notifier_block *nb);
181/* check if ipc is in recovery state */ 181/* check if ipc is in recovery state */
182#ifdef CONFIG_SYSLINK_RECOVERY 182#ifdef CONFIG_SYSLINK_RECOVERY
183bool ipc_recovering(void); 183bool ipc_recovering(void);
184#endif
185 184
186/* Indicate to schedule the recovery mechanism */ 185/* Indicate to schedule the recovery mechanism */
187void ipc_recover_schedule(void); 186void ipc_recover_schedule(void);
188 187#endif /* ifdef CONFIG_SYSLINK_RECOVERY */
189#endif /* ifndef _IPC_H_ */ 188#endif /* ifndef _IPC_H_ */
diff --git a/drivers/dsp/syslink/devh/44xx/devh44xx.c b/drivers/dsp/syslink/devh/44xx/devh44xx.c
index 3c7ec3fc44e..92ead7d71f7 100644
--- a/drivers/dsp/syslink/devh/44xx/devh44xx.c
+++ b/drivers/dsp/syslink/devh/44xx/devh44xx.c
@@ -98,9 +98,10 @@ static void devh_notification_handler(u16 proc_id, u16 line_id, u32 event_id,
98 pr_warning("Sys Error occured in Ducati for proc_id = %d\n", 98 pr_warning("Sys Error occured in Ducati for proc_id = %d\n",
99 proc_id); 99 proc_id);
100 100
101#ifdef CONFIG_SYSLINK_RECOVERY
101 /* schedule the recovery */ 102 /* schedule the recovery */
102 ipc_recover_schedule(); 103 ipc_recover_schedule();
103 104#endif /* ifdef CONFIG_SYSLINK_RECOVERY */
104 devh_notify_event((struct omap_devh *)arg, DEV_SYS_ERROR); 105 devh_notify_event((struct omap_devh *)arg, DEV_SYS_ERROR);
105} 106}
106 107
@@ -229,9 +230,10 @@ static int devh44xx_wdt_ipc_notifier_call(struct notifier_block *nb,
229 230
230 pr_warning("Ducati Watch Dog fired\n"); 231 pr_warning("Ducati Watch Dog fired\n");
231 232
233#ifdef CONFIG_SYSLINK_RECOVERY
232 /* schedule the recovery */ 234 /* schedule the recovery */
233 ipc_recover_schedule(); 235 ipc_recover_schedule();
234 236#endif /* ifdef CONFIG_SYSLINK_RECOVERY */
235 while (i--) { 237 while (i--) {
236 obj = devh_get_obj(i); 238 obj = devh_get_obj(i);
237 devh_notify_event(obj, DEV_WATCHDOG_ERROR); 239 devh_notify_event(obj, DEV_WATCHDOG_ERROR);