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

Commit 471cff7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fix from Greg KH:
 "Here is one misc driver fix for 3.17-rc5.  It resolves a kernel oops
  that can happen in the lattice FPGA driver if the firmware isn't
  present on the system.

  It's been in the linux-next tree for a while now"

* tag 'char-misc-3.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  Lattice ECP3 FPGA: Check firmware pointer
parents a6988b33 3f0d97d9

drivers/misc/lattice-ecp3-config.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,11 @@ static void firmware_load(const struct firmware *fw, void *context) 
	u32 jedec_id;

	u32 jedec_id;

	u32 status;

	u32 status;





	if (fw == NULL) {

		dev_err(&spi->dev, "Cannot load firmware, aborting\n");

		return;

	}



	if (fw->size == 0) {

	if (fw->size == 0) {

		dev_err(&spi->dev, "Error: Firmware size is 0!\n");

		dev_err(&spi->dev, "Error: Firmware size is 0!\n");

		return;

		return;