kirkwood-i2s.c (4ba24fef3eb3b142197135223b90ced2f319cd53) | kirkwood-i2s.c (aaa6d06282a749d0df8e5e22e73f8a3372f96853) |
---|---|
1/* 2 * kirkwood-i2s.c 3 * 4 * (c) 2010 Arnaud Patard <apatard@mandriva.com> 5 * (c) 2010 Arnaud Patard <arnaud.patard@rtp-net.org> 6 * 7 * This program is free software; you can redistribute it and/or modify it 8 * under the terms of the GNU General Public License as published by the --- 565 unchanged lines hidden (view full) --- 574 if (err < 0) 575 return err; 576 577 priv->extclk = devm_clk_get(&pdev->dev, "extclk"); 578 if (IS_ERR(priv->extclk)) { 579 if (PTR_ERR(priv->extclk) == -EPROBE_DEFER) 580 return -EPROBE_DEFER; 581 } else { | 1/* 2 * kirkwood-i2s.c 3 * 4 * (c) 2010 Arnaud Patard <apatard@mandriva.com> 5 * (c) 2010 Arnaud Patard <arnaud.patard@rtp-net.org> 6 * 7 * This program is free software; you can redistribute it and/or modify it 8 * under the terms of the GNU General Public License as published by the --- 565 unchanged lines hidden (view full) --- 574 if (err < 0) 575 return err; 576 577 priv->extclk = devm_clk_get(&pdev->dev, "extclk"); 578 if (IS_ERR(priv->extclk)) { 579 if (PTR_ERR(priv->extclk) == -EPROBE_DEFER) 580 return -EPROBE_DEFER; 581 } else { |
582 if (priv->extclk == priv->clk) { | 582 if (clk_is_match(priv->extclk, priv->clk)) { |
583 devm_clk_put(&pdev->dev, priv->extclk); 584 priv->extclk = ERR_PTR(-EINVAL); 585 } else { 586 dev_info(&pdev->dev, "found external clock\n"); 587 clk_prepare_enable(priv->extclk); 588 soc_dai = kirkwood_i2s_dai_extclk; 589 } 590 } --- 80 unchanged lines hidden --- | 583 devm_clk_put(&pdev->dev, priv->extclk); 584 priv->extclk = ERR_PTR(-EINVAL); 585 } else { 586 dev_info(&pdev->dev, "found external clock\n"); 587 clk_prepare_enable(priv->extclk); 588 soc_dai = kirkwood_i2s_dai_extclk; 589 } 590 } --- 80 unchanged lines hidden --- |