From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic.co.uk>
Subject: [patch 04/29] ASoC: Fix WM9081 platform data initialisation
Date: Thu, 10 Mar 2011 15:54:10 -0800 [thread overview]
Message-ID: <20110310235536.427263200@clark.kroah.org> (raw)
In-Reply-To: <20110310235548.GA10103@kroah.com>
2.6.37-stable review patch. If anyone has any objections, please let us know.
------------------
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
commit 3ee845acba58549578d03a46ed307c0a56c7f777 upstream.
It went AWOL in the multi-component conversion.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
sound/soc/codecs/wm9081.c | 5 +++++
1 file changed, 5 insertions(+)
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -15,6 +15,7 @@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/device.h>
#include <linux/pm.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
@@ -1338,6 +1339,10 @@ static __devinit int wm9081_i2c_probe(st
wm9081->control_type = SND_SOC_I2C;
wm9081->control_data = i2c;
+ if (dev_get_platdata(&i2c->dev))
+ memcpy(&wm9081->retune, dev_get_platdata(&i2c->dev),
+ sizeof(wm9081->retune));
+
ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm9081, &wm9081_dai, 1);
if (ret < 0)
next prev parent reply other threads:[~2011-03-10 23:57 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-10 23:55 [patch 00/29] 2.6.37.4-stable review Greg KH
2011-03-10 23:54 ` [patch 01/29] cpuset: add a missing unlock in cpuset_write_resmask() Greg KH
2011-03-10 23:54 ` [patch 02/29] virtio: console: Dont access vqs if device was unplugged Greg KH
2011-03-10 23:54 ` [patch 03/29] [S390] keyboard: integer underflow bug Greg KH
2011-03-10 23:54 ` Greg KH [this message]
2011-03-10 23:54 ` [patch 05/29] ALSA: HDA: Realtek: Fixup jack detection to input subsystem Greg KH
2011-03-10 23:54 ` [patch 06/29] ALSA: hda - Dont set to D3 in Cirrus errata init verbs Greg KH
2011-03-10 23:54 ` [patch 07/29] drivers/misc/bmp085.c: add MODULE_DEVICE_TABLE Greg KH
2011-03-10 23:54 ` [patch 08/29] nfs4: Ensure that ACL pages sent over NFS were not allocated from the slab (v3) Greg KH
2011-03-10 23:54 ` [patch 09/29] RxRPC: Fix v1 keys Greg KH
2011-03-10 23:54 ` [patch 10/29] ath9k: Fix ath9k prevents CPU to enter C3 states Greg KH
2011-03-10 23:54 ` [patch 11/29] ixgbe: fix for 82599 erratum on Header Splitting Greg KH
2011-03-10 23:54 ` [patch 12/29] mm: fix possible cause of a page_mapped BUG Greg KH
2011-03-10 23:54 ` [patch 13/29] netfilter: nf_log: avoid oops in (un)bind with invalid nfproto values Greg KH
2011-03-10 23:54 ` [patch 14/29] [CPUFREQ] pcc-cpufreq: dont load driver if get_freq fails during init Greg KH
2011-03-10 23:54 ` [patch 15/29] nfsd: wrong index used in inner loop Greg KH
2011-03-10 23:54 ` [patch 16/29] HID: hid-mosart: ignore buttons report Greg KH
2011-03-10 23:54 ` [patch 17/29] NFS: NFSv4 readdir loses entries Greg KH
2011-03-10 23:54 ` [patch 18/29] ipvs: fix dst_lock locking on dest update Greg KH
2011-03-10 23:54 ` [patch 19/29] net: dont allow CAP_NET_ADMIN to load non-netdev kernel modules Greg KH
2011-03-10 23:54 ` [patch 20/29] netfilter: arpt_mangle: fix return values of checkentry Greg KH
2011-03-10 23:54 ` [patch 21/29] r8169: use RxFIFO overflow workaround for 8168c chipset Greg KH
2011-03-10 23:54 ` [patch 22/29] r8169: RxFIFO overflow oddities with 8168 chipsets Greg KH
2011-03-10 23:54 ` [patch 23/29] r8169: prevent RxFIFO induced loops in the irq handler Greg KH
2011-03-10 23:54 ` [patch 24/29] drivers/net: Call netif_carrier_off at the end of the probe Greg KH
2011-03-10 23:54 ` [patch 25/29] sched: Fix sched rt group scheduling when hierachy is enabled Greg KH
2011-03-10 23:54 ` [patch 26/29] [media] ivtv: Fix corrective action taken upon DMA ERR interrupt to avoid hang Greg KH
2011-03-10 23:54 ` [patch 27/29] [media] cx23885: Revert "Check for slave nack on all transactions" Greg KH
2011-03-10 23:54 ` [patch 28/29] [media] cx25840: fix probing of cx2583x chips Greg KH
2011-03-10 23:54 ` [patch 29/29] [media] DiB7000M: add pid filtering Greg KH
2011-03-11 15:02 ` [patch 00/29] 2.6.37.4-stable review Stefan Lippers-Hollmann
2011-03-11 15:46 ` 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=20110310235536.427263200@clark.kroah.org \
--to=gregkh@suse.de \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/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®