From: Jarkko Nikula <jarkko.nikula@bitmer.com>
To: linux-kernel@vger.kernel.org
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Jarkko Nikula <jarkko.nikula@bitmer.com>,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Subject: [PATCH] mfd: twl4030-audio: Fix audio codec breakage
Date: Wed, 19 Oct 2011 11:44:05 +0300 [thread overview]
Message-ID: <1319013845-2628-1-git-send-email-jarkko.nikula@bitmer.com> (raw)
Commit 57fe725 ("MFD: twl4030-codec -> twl4030-audio: Rename the driver")
broke the device registration for twl4030 codec if twl6040 is not set.
Reason for breakage is that commit didn't update the changed config name for
macro twl_has_codec().
Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
I don't know is this too late for 3.1 or would it be better to queue for
stable when it's out? Anyway breakage happened in 3.1-rc cycle and unfortunately
I noticed it only now.
---
drivers/mfd/twl-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 01ecfee..b8eef46 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -109,7 +109,7 @@
#define twl_has_watchdog() false
#endif
-#if defined(CONFIG_TWL4030_CODEC) || defined(CONFIG_TWL4030_CODEC_MODULE) ||\
+#if defined(CONFIG_MFD_TWL4030_AUDIO) || defined(CONFIG_MFD_TWL4030_AUDIO_MODULE) ||\
defined(CONFIG_TWL6040_CORE) || defined(CONFIG_TWL6040_CORE_MODULE)
#define twl_has_codec() true
#else
--
1.7.6.3
next reply other threads:[~2011-10-19 8:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-19 8:44 Jarkko Nikula [this message]
2011-10-19 20:08 ` David Rientjes
2011-11-02 7:41 ` Péter Ujfalusi
2011-11-11 8:46 ` Jarkko Nikula
2011-11-16 23:45 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1319013845-2628-1-git-send-email-jarkko.nikula@bitmer.com \
--to=jarkko.nikula@bitmer.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®