From 7776d1f7d89bbea728d51377fdd6f7ad7bd78abe Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Fri, 24 Feb 2012 22:09:37 +0800 Subject: [PATCH] --- yaml --- r: 293419 b: refs/heads/master c: 7c59bc55e476947c1ea8a019e97aa648de53f5a0 h: refs/heads/master i: 293417: 77d86d532c9e685662b92294733254153b2ba242 293415: 77b7185edc31152c88dd8f4225b735d268e6f978 v: v3 --- [refs] | 2 +- trunk/sound/soc/fsl/mpc8610_hpcd.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 21f876dc5594..8a1be18c2083 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb1a6453bc413841876eac2ed1d7fd9e74b118fc +refs/heads/master: 7c59bc55e476947c1ea8a019e97aa648de53f5a0 diff --git a/trunk/sound/soc/fsl/mpc8610_hpcd.c b/trunk/sound/soc/fsl/mpc8610_hpcd.c index 15e06e9d362c..93256b39ccb6 100644 --- a/trunk/sound/soc/fsl/mpc8610_hpcd.c +++ b/trunk/sound/soc/fsl/mpc8610_hpcd.c @@ -336,12 +336,8 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev) const char *sprop; const u32 *iprop; - /* We are only interested in SSIs with a codec phandle in them, - * so let's make sure this SSI has one. The MPC8610 HPCD only - * knows about the CS4270 codec, so reject anything else. - */ - codec_np = get_node_by_phandle_name(np, "codec-handle", - "cirrus,cs4270"); + /* Find the codec node for this SSI. */ + codec_np = of_parse_phandle(np, "codec-handle", 0); if (!codec_np) { dev_err(dev, "invalid codec node\n"); return -EINVAL;