Merge tag 'v3.17-rc5' into usb-next

USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.

Signed-off-by: Johan Hovold <johan@kernel.org>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c
index 7ffdb589841e..7e1efd5f58f0 100644
--- a/drivers/misc/lattice-ecp3-config.c
+++ b/drivers/misc/lattice-ecp3-config.c
@@ -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;