git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
s390
/
cio
/
device_ops.c
diff --git
a/drivers/s390/cio/device_ops.c
b/drivers/s390/cio/device_ops.c
index
07a3d22
..
6c617dd
100644
(file)
--- a/
drivers/s390/cio/device_ops.c
+++ b/
drivers/s390/cio/device_ops.c
@@
-1,7
+1,7
@@
/*
* drivers/s390/cio/device_ops.c
*
/*
* drivers/s390/cio/device_ops.c
*
- * $Revision: 1.
50
$
+ * $Revision: 1.
47
$
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
*
* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
@@
-15,7
+15,6
@@
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/device.h>
#include <linux/slab.h>
#include <linux/list.h>
#include <linux/device.h>
-#include <linux/delay.h>
#include <asm/ccwdev.h>
#include <asm/idals.h>
#include <asm/ccwdev.h>
#include <asm/idals.h>
@@
-269,7
+268,7
@@
__ccw_device_retry_loop(struct ccw_device *cdev, struct ccw1 *ccw, long magic)
if ((ret == -EBUSY) || (ret == -EACCES)) {
/* Try again later. */
spin_unlock_irq(&sch->lock);
if ((ret == -EBUSY) || (ret == -EACCES)) {
/* Try again later. */
spin_unlock_irq(&sch->lock);
-
msleep(10
);
+
schedule_timeout(1
);
spin_lock_irq(&sch->lock);
continue;
}
spin_lock_irq(&sch->lock);
continue;
}
@@
-295,7
+294,7
@@
__ccw_device_retry_loop(struct ccw_device *cdev, struct ccw1 *ccw, long magic)
break;
/* Try again later. */
spin_unlock_irq(&sch->lock);
break;
/* Try again later. */
spin_unlock_irq(&sch->lock);
-
msleep(10
);
+
schedule_timeout(1
);
spin_lock_irq(&sch->lock);
} while (1);
spin_lock_irq(&sch->lock);
} while (1);