diff --git a/[refs] b/[refs]
index 0ab9f3c171e2..5205f328b190 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8abaee238ebb1ef9b8bcafac7a1833f92e7f2319
+refs/heads/master: cf4cf0bb89cbff95c5be8f8d3c68e55f38f94ba7
diff --git a/trunk/drivers/usb/misc/emi26.c b/trunk/drivers/usb/misc/emi26.c
index cd137577bb2d..4a09b87bdd28 100644
--- a/trunk/drivers/usb/misc/emi26.c
+++ b/trunk/drivers/usb/misc/emi26.c
@@ -114,6 +114,10 @@ static int emi26_load_firmware (struct usb_device *dev)
 
 	/* De-assert reset (let the CPU run) */
 	err = emi26_set_reset(dev,0);
+	if (err < 0) {
+		err("%s - error loading firmware: error = %d", __FUNCTION__, err);
+		goto wraperr;
+	}
 	msleep(250);	/* let device settle */
 
 	/* 2. We upload the FPGA firmware into the EMI