diff options
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch b/target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch index d261483563..c9eb3d2610 100644 --- a/target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch +++ b/target/linux/layerscape/patches-5.4/801-audio-0008-Revert-ASoC-Remove-dev_err-usage-after-platform_get_.patch @@ -86,42 +86,30 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5. if (err) { --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c -@@ -1195,8 +1195,10 @@ static int pm8916_wcd_analog_spmi_probe( - } +@@ -1196,6 +1196,7 @@ static int pm8916_wcd_analog_spmi_probe( irq = platform_get_irq_byname(pdev, "mbhc_switch_int"); -- if (irq < 0) -+ if (irq < 0) { + if (irq < 0) { + dev_err(dev, "failed to get mbhc switch irq\n"); - return irq; -+ } - - ret = devm_request_threaded_irq(dev, irq, NULL, - pm8916_mbhc_switch_irq_handler, -@@ -1208,8 +1210,10 @@ static int pm8916_wcd_analog_spmi_probe( - + ret = irq; + goto err_disable_clk; + } +@@ -1211,6 +1212,7 @@ static int pm8916_wcd_analog_spmi_probe( if (priv->mbhc_btn_enabled) { irq = platform_get_irq_byname(pdev, "mbhc_but_press_det"); -- if (irq < 0) -+ if (irq < 0) { + if (irq < 0) { + dev_err(dev, "failed to get button press irq\n"); - return irq; -+ } - - ret = devm_request_threaded_irq(dev, irq, NULL, - mbhc_btn_press_irq_handler, -@@ -1220,8 +1224,10 @@ static int pm8916_wcd_analog_spmi_probe( - dev_err(dev, "cannot request mbhc button press irq\n"); + ret = irq; + goto err_disable_clk; + } +@@ -1225,6 +1227,7 @@ static int pm8916_wcd_analog_spmi_probe( irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det"); -- if (irq < 0) -+ if (irq < 0) { + if (irq < 0) { + dev_err(dev, "failed to get button release irq\n"); - return irq; -+ } - - ret = devm_request_threaded_irq(dev, irq, NULL, - mbhc_btn_release_irq_handler, + ret = irq; + goto err_disable_clk; + } --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -1108,8 +1108,10 @@ static int twl6040_probe(struct snd_soc_ @@ -278,7 +266,7 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5. if (ret) { --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c -@@ -790,8 +790,12 @@ static int mxs_saif_probe(struct platfor +@@ -793,8 +793,12 @@ static int mxs_saif_probe(struct platfor return PTR_ERR(saif->base); irq = platform_get_irq(pdev, 0); |