openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x 

Conflicts:
	drivers/spi/spi-clps711x.c
This commit is contained in:
Mark Brown 2013-10-03 17:25:40 +01:00
parent c70837908d 0158026ccc
commit 2b2322d662
1 changed files with 0 additions and 3 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,6 @@ 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");
clk_put(hw->spi_clk);
goto err_out;
}
@ -246,7 +245,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
gpio_free(hw->chipselect[i]);
spi_master_put(master);
kfree(master);
return ret;
}
@ -262,7 +260,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
gpio_free(hw->chipselect[i]);
spi_unregister_master(master);
kfree(master);
return 0;
}