Skip to content

Commit

Permalink
Merge tag 'char-misc-3.17-rc5' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Sep 12, 2014
2 parents a6988b3 + 3f0d97d commit 471cff7
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/misc/lattice-ecp3-config.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ static void firmware_load(const struct firmware *fw, void *context)
u32 jedec_id;
u32 status;

if (fw == NULL) {
dev_err(&spi->dev, "Cannot load firmware, aborting\n");
return;
}

if (fw->size == 0) {
dev_err(&spi->dev, "Error: Firmware size is 0!\n");
return;
Expand Down

0 comments on commit 471cff7

Please sign in to comment.