Merge branch 'for-next' into topic/hda-core

1 files changed, 7 insertions, 12 deletions

diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index b47a69026f1b..57f7d25a2cd3 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -604,7 +604,7 @@ static void ess_audio_output_block_audio2
         ess_chgmixer (devc, 0x78, 0x03, 0x03);   /* Go */
 
         devc->irq_mode_16 = IMODE_OUTPUT;
-                devc->intr_active_16 = 1;
+        devc->intr_active_16 = 1;
 }
 
 static void ess_audio_output_block
@@ -1183,17 +1183,12 @@ FKS_test (devc);
                         chip = "ES1688";
                 }
 
-            printk ( KERN_INFO "ESS chip %s %s%s\n"
-               , chip
-               , ( devc->sbmo.esstype == ESSTYPE_DETECT || devc->sbmo.esstype == ESSTYPE_LIKE20
-                 ? "detected"
-                 : "specified"
-                 )
-               , ( devc->sbmo.esstype == ESSTYPE_LIKE20
-                 ? " (kernel 2.0 compatible)"
-                 : ""
-                 )
-               );
+                printk(KERN_INFO "ESS chip %s %s%s\n", chip,
+                       (devc->sbmo.esstype == ESSTYPE_DETECT ||
+                        devc->sbmo.esstype == ESSTYPE_LIKE20) ?
+                                "detected" : "specified",
+                        devc->sbmo.esstype == ESSTYPE_LIKE20 ?
+                                " (kernel 2.0 compatible)" : "");
 
                 sprintf(name,"ESS %s AudioDrive (rev %d)", chip, ess_minor & 0x0f);
         } else {