From 6edba853c02313e06f004b67dda1745a7164d3ed Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 6 Dec 2011 10:30:24 +0000
Subject: [PATCH] --- yaml --- r: 283891 b: refs/heads/master c:
 6664ee115bb45d912d64d1c6b26bd3b96ef7df09 h: refs/heads/master i:   283889:
 08724b1e58b26fba4c67a66d26132cc3fd3cd276   283887:
 30b45a04e09cb1b00ecbc1607c2eda01f95f5e7d v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8903.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index deeeb59df707..9e0d9e2b0ed1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d680b3a84b3e870fc1ea01495935e58e17de7aa
+refs/heads/master: 6664ee115bb45d912d64d1c6b26bd3b96ef7df09
diff --git a/trunk/sound/soc/codecs/wm8903.c b/trunk/sound/soc/codecs/wm8903.c
index adfbefaaab21..21b9fdc18319 100644
--- a/trunk/sound/soc/codecs/wm8903.c
+++ b/trunk/sound/soc/codecs/wm8903.c
@@ -2049,6 +2049,7 @@ static int wm8903_set_pdata_irq_trigger(struct i2c_client *i2c,
 
 	switch (irqd_get_trigger_type(irq_data)) {
 	case IRQ_TYPE_NONE:
+	default:
 		/*
 		* We assume the controller imposes no restrictions,
 		* so we are able to select active-high
@@ -2060,11 +2061,6 @@ static int wm8903_set_pdata_irq_trigger(struct i2c_client *i2c,
 	case IRQ_TYPE_LEVEL_LOW:
 		pdata->irq_active_low = true;
 		break;
-	default:
-		dev_err(&i2c->dev,
-			"Unsupported IRQ_TYPE %x\n",
-			irqd_get_trigger_type(irq_data));
-		return -EINVAL;
 	}
 
 	return 0;