diff options
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/scanlog.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index fd15e3e3bb33..17dc79198515 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -797,6 +797,7 @@ EXPORT_SYMBOL(rtas_call); | |||
797 | EXPORT_SYMBOL(rtas_data_buf); | 797 | EXPORT_SYMBOL(rtas_data_buf); |
798 | EXPORT_SYMBOL(rtas_data_buf_lock); | 798 | EXPORT_SYMBOL(rtas_data_buf_lock); |
799 | EXPORT_SYMBOL(rtas_busy_delay_time); | 799 | EXPORT_SYMBOL(rtas_busy_delay_time); |
800 | EXPORT_SYMBOL(rtas_busy_delay); | ||
800 | EXPORT_SYMBOL(rtas_get_sensor); | 801 | EXPORT_SYMBOL(rtas_get_sensor); |
801 | EXPORT_SYMBOL(rtas_get_power_level); | 802 | EXPORT_SYMBOL(rtas_get_power_level); |
802 | EXPORT_SYMBOL(rtas_set_power_level); | 803 | EXPORT_SYMBOL(rtas_set_power_level); |
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c index 50643496eb63..77a5bb1d9c30 100644 --- a/arch/powerpc/platforms/pseries/scanlog.c +++ b/arch/powerpc/platforms/pseries/scanlog.c | |||
@@ -107,9 +107,9 @@ static ssize_t scanlog_read(struct file *file, char __user *buf, | |||
107 | /* Break to sleep default time */ | 107 | /* Break to sleep default time */ |
108 | break; | 108 | break; |
109 | default: | 109 | default: |
110 | if (status > 9900 && status <= 9905) { | 110 | /* Assume extended busy */ |
111 | wait_time = rtas_extended_busy_delay_time(status); | 111 | wait_time = rtas_busy_delay_time(status); |
112 | } else { | 112 | if (!wait_time) { |
113 | printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status); | 113 | printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status); |
114 | return -EIO; | 114 | return -EIO; |
115 | } | 115 | } |