Merge tag 'for-3.7' of git://openrisc.net/jonas/linux

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / spi / spi-s3c24xx.c

diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 8ee7d790ce49424d4595321f6abc068bfcf7eb02..a2a080b7f42b2d9cb515b940301509466a92c7af 100644 (file)
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -611,6 +611,7 @@ static int __devinit s3c24xx_spi_probe(struct platform_device *pdev)
        if (!pdata->set_cs) {
                if (pdata->pin_cs < 0) {
                        dev_err(&pdev->dev, "No chipselect pin\n");
+                       err = -EINVAL;
                        goto err_register;
                }