Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'spi/topic/clps711x' into spi-next

Browse source
This commit is contained in:
Mark Brown 2013-10-25 09:51:24 +01:00
commit d42b70f5c7
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/spi/spi-clps711x.c
View file

@ -226,7 +226,7 @@ static int spi_clps711x_probe(struct platform_device *pdev)
dev_name(&pdev->dev), hw); dev_name(&pdev->dev), hw);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Can't request IRQ\n"); dev_err(&pdev->dev, "Can't request IRQ\n");
goto clk_out; goto err_out;
} }
ret = devm_spi_register_master(&pdev->dev, master); 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"); dev_err(&pdev->dev, "Failed to register master\n");
clk_out:
err_out: err_out:
while (--i >= 0) while (--i >= 0)
if (gpio_is_valid(hw->chipselect[i])) if (gpio_is_valid(hw->chipselect[i]))