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

This commit is contained in:
Mark Brown 2013-09-26 11:40:56 +01:00
commit 13e92b5b1e

View file

@ -247,7 +247,6 @@ static int spi_clps711x_probe(struct platform_device *pdev)
gpio_free(hw->chipselect[i]);
spi_master_put(master);
kfree(master);
return ret;
}
@ -263,7 +262,6 @@ static int spi_clps711x_remove(struct platform_device *pdev)
gpio_free(hw->chipselect[i]);
spi_unregister_master(master);
kfree(master);
return 0;
}