diff options
Diffstat (limited to 'drivers/macintosh/adb.c')
-rw-r--r-- | drivers/macintosh/adb.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 781d93b0bbd5..259fd8973ce9 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
@@ -81,7 +81,7 @@ static struct adb_driver *adb_driver_list[] = { | |||
81 | static struct class *adb_dev_class; | 81 | static struct class *adb_dev_class; |
82 | 82 | ||
83 | struct adb_driver *adb_controller; | 83 | struct adb_driver *adb_controller; |
84 | struct notifier_block *adb_client_list = NULL; | 84 | BLOCKING_NOTIFIER_HEAD(adb_client_list); |
85 | static int adb_got_sleep; | 85 | static int adb_got_sleep; |
86 | static int adb_inited; | 86 | static int adb_inited; |
87 | static pid_t adb_probe_task_pid; | 87 | static pid_t adb_probe_task_pid; |
@@ -355,7 +355,8 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when) | |||
355 | /* Stop autopoll */ | 355 | /* Stop autopoll */ |
356 | if (adb_controller->autopoll) | 356 | if (adb_controller->autopoll) |
357 | adb_controller->autopoll(0); | 357 | adb_controller->autopoll(0); |
358 | ret = notifier_call_chain(&adb_client_list, ADB_MSG_POWERDOWN, NULL); | 358 | ret = blocking_notifier_call_chain(&adb_client_list, |
359 | ADB_MSG_POWERDOWN, NULL); | ||
359 | if (ret & NOTIFY_STOP_MASK) { | 360 | if (ret & NOTIFY_STOP_MASK) { |
360 | up(&adb_probe_mutex); | 361 | up(&adb_probe_mutex); |
361 | return PBOOK_SLEEP_REFUSE; | 362 | return PBOOK_SLEEP_REFUSE; |
@@ -392,7 +393,8 @@ do_adb_reset_bus(void) | |||
392 | if (adb_controller->autopoll) | 393 | if (adb_controller->autopoll) |
393 | adb_controller->autopoll(0); | 394 | adb_controller->autopoll(0); |
394 | 395 | ||
395 | nret = notifier_call_chain(&adb_client_list, ADB_MSG_PRE_RESET, NULL); | 396 | nret = blocking_notifier_call_chain(&adb_client_list, |
397 | ADB_MSG_PRE_RESET, NULL); | ||
396 | if (nret & NOTIFY_STOP_MASK) { | 398 | if (nret & NOTIFY_STOP_MASK) { |
397 | if (adb_controller->autopoll) | 399 | if (adb_controller->autopoll) |
398 | adb_controller->autopoll(autopoll_devs); | 400 | adb_controller->autopoll(autopoll_devs); |
@@ -427,7 +429,8 @@ do_adb_reset_bus(void) | |||
427 | } | 429 | } |
428 | up(&adb_handler_sem); | 430 | up(&adb_handler_sem); |
429 | 431 | ||
430 | nret = notifier_call_chain(&adb_client_list, ADB_MSG_POST_RESET, NULL); | 432 | nret = blocking_notifier_call_chain(&adb_client_list, |
433 | ADB_MSG_POST_RESET, NULL); | ||
431 | if (nret & NOTIFY_STOP_MASK) | 434 | if (nret & NOTIFY_STOP_MASK) |
432 | return -EBUSY; | 435 | return -EBUSY; |
433 | 436 | ||