Просмотр исходного кода

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
Linus Torvalds 14 лет назад
Родитель
Сommit
562d1ffed2
1 измененных файлов с 1 добавлено и 0 удалено
  1. 1 0
      drivers/spi/amba-pl022.c

+ 1 - 0
drivers/spi/amba-pl022.c

@@ -1861,6 +1861,7 @@ static int pl022_setup(struct spi_device *spi)
 	}
 	}
 	if ((clk_freq.cpsdvsr < CPSDVR_MIN)
 	if ((clk_freq.cpsdvsr < CPSDVR_MIN)
 	    || (clk_freq.cpsdvsr > CPSDVR_MAX)) {
 	    || (clk_freq.cpsdvsr > CPSDVR_MAX)) {
+		status = -EINVAL;
 		dev_err(&spi->dev,
 		dev_err(&spi->dev,
 			"cpsdvsr is configured incorrectly\n");
 			"cpsdvsr is configured incorrectly\n");
 		goto err_config_params;
 		goto err_config_params;