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-linus

This commit is contained in:
Mark Brown 2013-10-07 14:51:56 +01:00
parent de8cc234a5 0158026ccc
commit a19be58c9c
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); 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");
clk_put(hw->spi_clk);
goto clk_out; goto clk_out;
} }
@ -247,7 +246,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
gpio_free(hw->chipselect[i]); gpio_free(hw->chipselect[i]);
spi_master_put(master); spi_master_put(master);
kfree(master);
return ret; return ret;
} }
@ -263,7 +261,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
gpio_free(hw->chipselect[i]); gpio_free(hw->chipselect[i]);
spi_unregister_master(master); spi_unregister_master(master);
kfree(master);
return 0; return 0;
} }