浏览代码

spi: spi-sh: fix error return code in spi_sh_probe()

platform_get_irq() returns an error code, but the spi-sh driver
ignores it and always returns -ENODEV. This is not correct and,
prevents -EPROBE_DEFER from being propagated properly.

Print and propagate the return value of platform_get_irq on failure.

This issue was detected with the help of Coccinelle.

Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Gustavo A. R. Silva 8 年之前
父节点
当前提交
345fef75d7
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/spi/spi-sh.c

+ 2 - 2
drivers/spi/spi-sh.c

@@ -446,8 +446,8 @@ static int spi_sh_probe(struct platform_device *pdev)
 
 
 	irq = platform_get_irq(pdev, 0);
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
 	if (irq < 0) {
-		dev_err(&pdev->dev, "platform_get_irq error\n");
-		return -ENODEV;
+		dev_err(&pdev->dev, "platform_get_irq error: %d\n", irq);
+		return irq;
 	}
 	}
 
 
 	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_sh_data));
 	master = spi_alloc_master(&pdev->dev, sizeof(struct spi_sh_data));