Commit 7878f411 authored by Jeff Garzik's avatar Jeff Garzik

Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5

into mandrakesoft.com:/home/jgarzik/repo/misc-2.5
parents 2ce067b0 90922aa6
......@@ -386,8 +386,7 @@ static inline void sony_sleep(void)
unsigned long flags;
if (cdu31a_irq <= 0) {
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(0);
yield();
} else { /* Interrupt driven */
save_flags(flags);
......
......@@ -344,8 +344,7 @@ static inline void
sony_sleep(void)
{
if (sony535_irq_used <= 0) { /* poll */
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(0);
yield();
} else { /* Interrupt driven */
cli();
enable_interrupts();
......
......@@ -295,8 +295,8 @@ card_wait_for_busy_clear(const int ioaddr[], const char* name)
timeout = jiffies + TimeOutJiffies;
while (a & 0x80 || a & 0x40) {
/* a little sleep */
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(0);
yield();
a = inb(ioaddr[0] + 7);
if (jiffies >= timeout) {
printk(KERN_WARNING "%s: card_wait_for_busy_clear timeout\n",
......@@ -319,8 +319,8 @@ card_wait_for_ready(const int ioaddr[], const char* name, unsigned char in[])
timeout = jiffies + TimeOutJiffies;
while (a & 0x80 || !(a & 0x40)) {
/* a little sleep */
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(0);
yield();
a = inb(ioaddr[1] + 6);
if (jiffies >= timeout) {
printk(KERN_WARNING "%s: card_wait_for_ready timeout\n",
......
......@@ -573,8 +573,8 @@ static int __init sis900_mii_probe (struct net_device * net_dev)
if(status & MII_STAT_LINK){
while (poll_bit) {
current->state = TASK_INTERRUPTIBLE;
schedule_timeout(0);
yield();
poll_bit ^= (mdio_read(net_dev, sis_priv->cur_phy, MII_STATUS) & poll_bit);
if (jiffies >= timeout) {
printk(KERN_WARNING "%s: reset phy and link down now\n", net_dev->name);
......
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