diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 13:33:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-13 13:33:31 -0400 |
| commit | 562d1ffed2082fc59fb72173b856822ffe781559 (patch) | |
| tree | 89b0a788bc19e668cd12feb5f6495260896d9da2 /drivers | |
| parent | acb11bcdbde29cfedaaedfea314b922b99274907 (diff) | |
| parent | e3f88ae9960920598cad132c553019ee79ff3aca (diff) | |
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
* 'spi/merge' of git://git.secretlab.ca/git/linux-2.6:
spi-pl022: Add missing return value update
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/amba-pl022.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index 6a9e58dd36c7..d18ce9e946d8 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) | |||
| 1861 | } | 1861 | } |
| 1862 | if ((clk_freq.cpsdvsr < CPSDVR_MIN) | 1862 | if ((clk_freq.cpsdvsr < CPSDVR_MIN) |
| 1863 | || (clk_freq.cpsdvsr > CPSDVR_MAX)) { | 1863 | || (clk_freq.cpsdvsr > CPSDVR_MAX)) { |
| 1864 | status = -EINVAL; | ||
| 1864 | dev_err(&spi->dev, | 1865 | dev_err(&spi->dev, |
| 1865 | "cpsdvsr is configured incorrectly\n"); | 1866 | "cpsdvsr is configured incorrectly\n"); |
| 1866 | goto err_config_params; | 1867 | goto err_config_params; |