From: Mark Brown <broonie@linaro.org>
Date: Fri, 25 Oct 2013 08:51:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/hspi' into spi-next
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=ffd6dd3eaa1e6a0d454c08efcc996ea7014aa1d2;p=deliverable%2Flinux.git

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

ffd6dd3eaa1e6a0d454c08efcc996ea7014aa1d2
diff --cc drivers/spi/spi-sh-hspi.c
index 7e749a22f51e,8a147d92f9eb..292567ab4c6c
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@@ -303,9 -303,10 +303,10 @@@ static int hspi_probe(struct platform_d
  	master->setup		= hspi_setup;
  	master->cleanup		= hspi_cleanup;
  	master->mode_bits	= SPI_CPOL | SPI_CPHA;
+ 	master->dev.of_node	= pdev->dev.of_node;
  	master->auto_runtime_pm = true;
  	master->transfer_one_message		= hspi_transfer_one_message;
 -	ret = spi_register_master(master);
 +	ret = devm_spi_register_master(&pdev->dev, master);
  	if (ret < 0) {
  		dev_err(&pdev->dev, "spi_register_master error.\n");
  		goto error1;