diff --git a/[refs] b/[refs]
index aeb93906fc6f..b9587cabb323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58c12bdc5d924e4bca60c2660df2a71be4953ac9
+refs/heads/master: 783058fd582a1d8afbbf1d4e9b7918614a4550ff
diff --git a/trunk/drivers/spi/spi_mpc8xxx.c b/trunk/drivers/spi/spi_mpc8xxx.c
index 0fd0ec4d3a7d..518671b8afe5 100644
--- a/trunk/drivers/spi/spi_mpc8xxx.c
+++ b/trunk/drivers/spi/spi_mpc8xxx.c
@@ -709,6 +709,7 @@ static int of_mpc8xxx_spi_get_chipselects(struct device *dev)
 		gpio = of_get_gpio_flags(np, i, &flags);
 		if (!gpio_is_valid(gpio)) {
 			dev_err(dev, "invalid gpio #%d: %d\n", i, gpio);
+			ret = gpio;
 			goto err_loop;
 		}