From a1f85e1968d08f80d26248ee94a3e20edffa3efe Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 6 Jan 2010 19:24:25 +0000 Subject: [PATCH] --- yaml --- r: 186879 b: refs/heads/master c: 59f25070df0325067d7916b467ad15725657fedc h: refs/heads/master i: 186877: f6dbc0669fbb049b91f14dc98d94dadb4703bfa2 186875: afe904a195054e3bb14724d016e8cdb0f48ab9a9 186871: 3562caa5d51397e0e617bc4dabc057b0b138cf26 186863: e98049dfb67525ce81777d032627c58925b74cb6 186847: 69db7a66a033d4d6eab1ccf3263fdd1fbb38a282 186815: fcf1333b4e417fa97eda67382e33c9b887413661 186751: 1f8d03b6fa2bf79f900ecd643b87d1e9ae3c8ddd 186623: 664026ccf178f7f7a1d13eea4a2f11e3d25e066d 186367: 7a43816000d5a33f5d151467540eade6eb1c6568 v: v3 --- [refs] | 2 +- trunk/drivers/power/wm8350_power.c | 2 +- trunk/sound/soc/codecs/wm8350.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f645ef8d5561..6a2ba7653820 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecf926bcda5ba1da7269dcaa71a1b6920dc48349 +refs/heads/master: 59f25070df0325067d7916b467ad15725657fedc diff --git a/trunk/drivers/power/wm8350_power.c b/trunk/drivers/power/wm8350_power.c index 3839a5e1c4a7..0693902d6151 100644 --- a/trunk/drivers/power/wm8350_power.c +++ b/trunk/drivers/power/wm8350_power.c @@ -190,7 +190,7 @@ static irqreturn_t wm8350_charger_handler(int irq, void *data) struct wm8350_power *power = &wm8350->power; struct wm8350_charger_policy *policy = power->policy; - switch (irq) { + switch (irq - wm8350->irq_base) { case WM8350_IRQ_CHG_BAT_FAIL: dev_err(wm8350->dev, "battery failed\n"); break; diff --git a/trunk/sound/soc/codecs/wm8350.c b/trunk/sound/soc/codecs/wm8350.c index 079bf745bf05..df2c6d9617fb 100644 --- a/trunk/sound/soc/codecs/wm8350.c +++ b/trunk/sound/soc/codecs/wm8350.c @@ -1349,7 +1349,7 @@ static irqreturn_t wm8350_hp_jack_handler(int irq, void *data) int mask; struct wm8350_jack_data *jack = NULL; - switch (irq) { + switch (irq - wm8350->irq_base) { case WM8350_IRQ_CODEC_JCK_DET_L: jack = &priv->hpl; mask = WM8350_JACK_L_LVL; @@ -1424,7 +1424,7 @@ int wm8350_hp_jack_detect(struct snd_soc_codec *codec, enum wm8350_jack which, wm8350_set_bits(wm8350, WM8350_JACK_DETECT, ena); /* Sync status */ - wm8350_hp_jack_handler(irq, priv); + wm8350_hp_jack_handler(irq + wm8350->irq_base, priv); return 0; }