1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 88bb9d05b038..a0c09adf7e7d 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -840,7 +840,7 @@ acpi_status acpi_os_remove_interrupt_handler(u32 irq, acpi_osd_handler handler)
 
 void acpi_os_sleep(u64 ms)
 {
-        schedule_timeout_interruptible(msecs_to_jiffies(ms));
+        msleep(ms);
 }
 
 void acpi_os_stall(u32 us)
@@ -1355,7 +1355,7 @@ static int __init acpi_os_name_setup(char *str)
         if (!str || !*str)
                 return 0;
 
-        for (; count-- && str && *str; str++) {
+        for (; count-- && *str; str++) {
                 if (isalnum(*str) || *str == ' ' || *str == ':')
                         *p++ = *str;
                 else if (*str == '\'' || *str == '"')