Merge branch 'pm-sysoff'

[linux-2.6-microblaze.git] / drivers / comedi / drivers.c

diff --git a/drivers/comedi/drivers.c b/drivers/comedi/drivers.c
index 8eb1f69..d4e2ed7 100644 (file)
--- 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);