diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /arch/ppc/8xx_io | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'arch/ppc/8xx_io')
| -rw-r--r-- | arch/ppc/8xx_io/fec.c | 4 | ||||
| -rw-r--r-- | arch/ppc/8xx_io/uart.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 45f10b635..659576e8c 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c @@ -1214,7 +1214,7 @@ static void mii_queue_relink(uint mii_reg, struct net_device *dev) fep->phy_task.routine = (void *)mii_relink; fep->phy_task.data = dev; - queue_task(&fep->phy_task, &tq_scheduler); + schedule_task(&fep->phy_task); } static void mii_queue_config(uint mii_reg, struct net_device *dev) @@ -1223,7 +1223,7 @@ static void mii_queue_config(uint mii_reg, struct net_device *dev) fep->phy_task.routine = (void *)mii_display_config; fep->phy_task.data = dev; - queue_task(&fep->phy_task, &tq_scheduler); + schedule_task(&fep->phy_task); } diff --git a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c index 7c05954c2..598e13ac0 100644 --- a/arch/ppc/8xx_io/uart.c +++ b/arch/ppc/8xx_io/uart.c @@ -514,8 +514,9 @@ static _INLINE_ void check_modem_status(struct async_struct *info) #ifdef SERIAL_DEBUG_OPEN printk("scheduling hangup..."); #endif - queue_task(&info->tqueue_hangup, - &tq_scheduler); + MOD_INC_USE_COUNT; + if (schedule_task(&info->tqueue_hangup) == 0) + MOD_DEC_USE_COUNT; } } if (info->flags & ASYNC_CTS_FLOW) { @@ -645,10 +646,9 @@ static void do_serial_hangup(void *private_) struct tty_struct *tty; tty = info->tty; - if (!tty) - return; - - tty_hangup(tty); + if (tty) + tty_hangup(tty); + MOD_DEC_USE_COUNT; } /*static void rs_8xx_timer(void) |