Commit b0538e0e authored by Linus Torvalds's avatar Linus Torvalds

Merge http://gkernel.bkbits.net/misc-2.5

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