Index: firmware/powermgmt.c
===================================================================
--- firmware/powermgmt.c	(revision 12098)
+++ firmware/powermgmt.c	(working copy)
@@ -1334,12 +1312,9 @@
 #endif
 
     mp3_shutdown();
-#ifdef HAVE_UDA1380
+#if defined(HAVE_UDA1380) || defined(HAVE_TLV320) || defined(HAVE_WM8758) || \
+            defined(HAVE_WM8975) || defined(HAVE_WM8731)
     audiohw_close();
-#elif defined(HAVE_TLV320)
-    audiohw_close();
-#elif defined(HAVE_WM8758) || defined(HAVE_WM8975) | defined(HAVE_WM8731)
-    audiohw_close();
 #endif
     /* If HD is still active we try to wait for spindown, otherwise the
        shutdown_timeout in power_thread_sleep will force a power off */