Commit 0b4c7527 authored by Andrew Morton's avatar Andrew Morton Committed by James Bottomley

[PATCH] 3ware 9000 schedule_timeout fix

From: "Adam Radford" <aradford@amcc.com>

This small patch fixes the broken schedule_timeout() usage in the 3w-9xxx
driver, and replaces the calls with msleep().
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 14d6e9e1
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
History History
------- -------
2.26.02.000 - Driver cleanup for kernel submission. 2.26.02.000 - Driver cleanup for kernel submission.
2.26.02.001 - Replace schedule_timeout() calls with msleep().
*/ */
#include <linux/module.h> #include <linux/module.h>
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
#include "3w-9xxx.h" #include "3w-9xxx.h"
/* Globals */ /* Globals */
static const char *twa_driver_version="2.26.02.000"; static const char *twa_driver_version="2.26.02.001";
static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT]; static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT];
static unsigned int twa_device_extension_count; static unsigned int twa_device_extension_count;
static int twa_major = -1; static int twa_major = -1;
...@@ -1445,7 +1446,7 @@ static int twa_poll_status(TW_Device_Extension *tw_dev, u32 flag, int seconds) ...@@ -1445,7 +1446,7 @@ static int twa_poll_status(TW_Device_Extension *tw_dev, u32 flag, int seconds)
if (time_after(jiffies, before + HZ * seconds)) if (time_after(jiffies, before + HZ * seconds))
goto out; goto out;
schedule_timeout(1); msleep(50);
} }
retval = 0; retval = 0;
out: out:
...@@ -1473,7 +1474,7 @@ static int twa_poll_status_gone(TW_Device_Extension *tw_dev, u32 flag, int secon ...@@ -1473,7 +1474,7 @@ static int twa_poll_status_gone(TW_Device_Extension *tw_dev, u32 flag, int secon
if (time_after(jiffies, before + HZ * seconds)) if (time_after(jiffies, before + HZ * seconds))
goto out; goto out;
schedule_timeout(1); msleep(50);
} }
retval = 0; retval = 0;
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment