Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 562d1ffe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents acb11bcd e3f88ae9
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -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;