diff --git a/[refs] b/[refs] index 72d3f407d84d..1d05e594e48a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a5ef41661b56cf4eee042a6967c4e14b63e8eac +refs/heads/master: dc731fbbadf5d65c98fcd6c86472aa286c16458a diff --git a/trunk/arch/x86/kernel/apm_32.c b/trunk/arch/x86/kernel/apm_32.c index 79302e9a33a4..442b5508893f 100644 --- a/trunk/arch/x86/kernel/apm_32.c +++ b/trunk/arch/x86/kernel/apm_32.c @@ -811,7 +811,7 @@ static int apm_do_idle(void) u8 ret = 0; int idled = 0; int polling; - int err; + int err = 0; polling = !!(current_thread_info()->status & TS_POLLING); if (polling) {