diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index e76d469f031..a5940e97a0a 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -85,7 +85,8 @@ static int loading_timeout = 60;	/* In seconds */
 
 static inline long firmware_loading_timeout(void)
 {
-	return loading_timeout > 0 ? loading_timeout * HZ : MAX_SCHEDULE_TIMEOUT;
+	return loading_timeout > 0 ? msecs_to_jiffies(loading_timeout * 1000) :
+	        MAX_SCHEDULE_TIMEOUT;
 }
 
 /* fw_lock could be moved to 'struct firmware_priv' but since it is just