diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-04 09:15:45 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2018-01-04 09:15:45 +0530 |
| commit | 8d13ea761e92d9f28f0cc474d8c2f411bcd2d08b (patch) | |
| tree | 81e1736f996702e84c4372a5094841af049fb01b /drivers/mfd/twl4030-audio.c | |
| parent | 79202ff9eb5cb9515b2fea57ad5bfbcfe78279b6 (diff) | |
| parent | e68d6189c7872b2b3731276bda5f5e0c8d5ba644 (diff) | |
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.109-hikey
Diffstat (limited to 'drivers/mfd/twl4030-audio.c')
| -rw-r--r-- | drivers/mfd/twl4030-audio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c index 0a1606480023..cc832d309599 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c @@ -159,13 +159,18 @@ unsigned int twl4030_audio_get_mclk(void) EXPORT_SYMBOL_GPL(twl4030_audio_get_mclk); static bool twl4030_audio_has_codec(struct twl4030_audio_data *pdata, - struct device_node *node) + struct device_node *parent) { + struct device_node *node; + if (pdata && pdata->codec) return true; - if (of_find_node_by_name(node, "codec")) + node = of_get_child_by_name(parent, "codec"); + if (node) { + of_node_put(node); return true; + } return false; } |