From d401ff5f83a727a5c3aaf2a34a9126450d6351b2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 19 Jul 2012 14:36:13 +0900
Subject: [PATCH] --- yaml --- r: 313359 b: refs/heads/master c:
 49f3eacfcdab2e1cd381dc8e820bb6840787be00 h: refs/heads/master i:   313357:
 37578178997ecf20d27529cd0b8718a94c1584e8   313355:
 89ab3ab5b515928a6956c24b095ec5139ddd19f1   313351:
 41be503c7300b97a4d53cd709449c5856a24ae30   313343:
 63050c95227e116ed259ee1b3546d4d55151c917 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/spi/spi-s3c64xx.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1a3f78330b87..b558b93b62c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9ed561ebd71f7a9a3238507ef9082862e2cbc9a
+refs/heads/master: 49f3eacfcdab2e1cd381dc8e820bb6840787be00
diff --git a/trunk/drivers/spi/spi-s3c64xx.c b/trunk/drivers/spi/spi-s3c64xx.c
index 0dedbbdb153a..0bec10b7e6c0 100644
--- a/trunk/drivers/spi/spi-s3c64xx.c
+++ b/trunk/drivers/spi/spi-s3c64xx.c
@@ -896,9 +896,9 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
 	if (!spi_get_ctldata(spi)) {
 		err = gpio_request(cs->line, dev_name(&spi->dev));
 		if (err) {
-			dev_err(&spi->dev, "request for slave select gpio "
-					"line [%d] failed\n", cs->line);
-			err = -EBUSY;
+			dev_err(&spi->dev,
+				"Failed to get /CS gpio [%d]: %d\n",
+				cs->line, err);
 			goto err_gpio_req;
 		}
 		spi_set_ctldata(spi, cs);
@@ -1116,7 +1116,8 @@ static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd)
 
 		ret = gpio_request(gpio, "spi-bus");
 		if (ret) {
-			dev_err(dev, "gpio [%d] request failed\n", gpio);
+			dev_err(dev, "gpio [%d] request failed: %d\n",
+				gpio, ret);
 			goto free_gpio;
 		}
 	}