From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 10 Dec 2013 23:31:25 +0000 (-0700)
Subject: staging: comedi: drivers: fix return value of comedi_load_firmware()
X-Git-Tag: v3.12.7~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bec1a4f8696c44ce96398dceab8aba4785ec8ea9;p=thirdparty%2Fkernel%2Fstable.git

staging: comedi: drivers: fix return value of comedi_load_firmware()

commit c6236c0ce39c809c336ca929f68cf8ad02cf94e0 upstream.

Some of the callback functions that upload the firmware in the comedi
drivers return a positive value indicating the number of bytes sent
to the device. Detect this condition and just return '0' to indicate
a successful upload.

Reported-by: Bernd Porr <mail@berndporr.me.uk>
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Ian Abbott <abbotti@mev.co.uk>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 317a821b79064..316c44401372e 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -417,7 +417,7 @@ int comedi_load_firmware(struct comedi_device *dev,
 		release_firmware(fw);
 	}
 
-	return ret;
+	return ret < 0 ? ret : 0;
 }
 EXPORT_SYMBOL_GPL(comedi_load_firmware);