Merge remote-tracking branch 'spi/topic/clps711x' into spi-next
This commit is contained in:
commit
d42b70f5c7
1 changed files with 1 additions and 2 deletions
|
@ -226,7 +226,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
|
|||
dev_name(&pdev->dev), hw);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Can't request IRQ\n");
|
||||
goto clk_out;
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
ret = devm_spi_register_master(&pdev->dev, master);
|
||||
|
@ -239,7 +239,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
|
|||
|
||||
dev_err(&pdev->dev, "Failed to register master\n");
|
||||
|
||||
clk_out:
|
||||
err_out:
|
||||
while (--i >= 0)
|
||||
if (gpio_is_valid(hw->chipselect[i]))
|
||||
|
|
Loading…
Reference in a new issue