Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6

562d1ffe · Linus Torvalds <[email protected]> · 2011-06-13 10:33:31 -07:00

* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
  spi-pl022: Add missing return value update

Merge commit. Changes below are compared with the first parent: acb11bcd.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/spi/amba-pl022.c	modified	+1	−0	View file

diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index 6a9e58d..d18ce9e 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -1861,6 +1861,7 @@ static int pl022_setup(struct spi_device *spi)
 	}
 	if ((clk_freq.cpsdvsr < CPSDVR_MIN)
 	    || (clk_freq.cpsdvsr > CPSDVR_MAX)) {
+		status = -EINVAL;
 		dev_err(&spi->dev,
 			"cpsdvsr is configured incorrectly\n");
 		goto err_config_params;