diff options
| -rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 40be08cecea4..804c6f2bcf21 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
| @@ -1868,6 +1868,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) | |||
| 1868 | if (irq >= 0) { | 1868 | if (irq >= 0) { |
| 1869 | irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_common", | 1869 | irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_common", |
| 1870 | dev_name(&pdev->dev)); | 1870 | dev_name(&pdev->dev)); |
| 1871 | if (!irq_name) { | ||
| 1872 | ret = -ENOMEM; | ||
| 1873 | goto err; | ||
| 1874 | } | ||
| 1871 | ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, | 1875 | ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, |
| 1872 | davinci_mcasp_common_irq_handler, | 1876 | davinci_mcasp_common_irq_handler, |
| 1873 | IRQF_ONESHOT | IRQF_SHARED, | 1877 | IRQF_ONESHOT | IRQF_SHARED, |
| @@ -1885,6 +1889,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) | |||
| 1885 | if (irq >= 0) { | 1889 | if (irq >= 0) { |
| 1886 | irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_rx", | 1890 | irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_rx", |
| 1887 | dev_name(&pdev->dev)); | 1891 | dev_name(&pdev->dev)); |
| 1892 | if (!irq_name) { | ||
| 1893 | ret = -ENOMEM; | ||
| 1894 | goto err; | ||
| 1895 | } | ||
| 1888 | ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, | 1896 | ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, |
| 1889 | davinci_mcasp_rx_irq_handler, | 1897 | davinci_mcasp_rx_irq_handler, |
| 1890 | IRQF_ONESHOT, irq_name, mcasp); | 1898 | IRQF_ONESHOT, irq_name, mcasp); |
| @@ -1900,6 +1908,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev) | |||
| 1900 | if (irq >= 0) { | 1908 | if (irq >= 0) { |
| 1901 | irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_tx", | 1909 | irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_tx", |
| 1902 | dev_name(&pdev->dev)); | 1910 | dev_name(&pdev->dev)); |
| 1911 | if (!irq_name) { | ||
| 1912 | ret = -ENOMEM; | ||
| 1913 | goto err; | ||
| 1914 | } | ||
| 1903 | ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, | 1915 | ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, |
| 1904 | davinci_mcasp_tx_irq_handler, | 1916 | davinci_mcasp_tx_irq_handler, |
| 1905 | IRQF_ONESHOT, irq_name, mcasp); | 1917 | IRQF_ONESHOT, irq_name, mcasp); |
