X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=drivers%2Fcomedi%2Fdrivers.c;h=d4e2ed709bfc7a5e27dd2361fa61ae6d1a85ebb2;hb=67e59f8d019fb097f35c82533cc9b27bb392e5b1;hp=8eb1f699a857baeaba8a37570327c33deeb185e5;hpb=2d2c73318bd51e430da6818c0d12973081aba8d2;p=linux-2.6-microblaze.git

diff --git a/drivers/comedi/drivers.c b/drivers/comedi/drivers.c
index 8eb1f699a857..d4e2ed709bfc 100644
--- a/drivers/comedi/drivers.c
+++ b/drivers/comedi/drivers.c
@@ -854,7 +854,7 @@ int comedi_load_firmware(struct comedi_device *dev,
 		release_firmware(fw);
 	}
 
-	return ret < 0 ? ret : 0;
+	return min(ret, 0);
 }
 EXPORT_SYMBOL_GPL(comedi_load_firmware);