Commit d2a14c07 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] fix m68knommu/ColdFire serial port hang

This patches fixes a serial port "hang" on the m68knommu ColdFire
serial driver. It was erroneoulsy looking for a state bit that
is never set.
parent 026f1865
/* /*
* mcfserial.c -- serial driver for ColdFire internal UARTS. * mcfserial.c -- serial driver for ColdFire internal UARTS.
* *
* Copyright (C) 1999-2002 Greg Ungerer <gerg@snapgear.com> * Copyright (C) 1999-2003 Greg Ungerer <gerg@snapgear.com>
* Copyright (c) 2000-2001 Lineo, Inc. <www.lineo.com> * Copyright (c) 2000-2001 Lineo, Inc. <www.lineo.com>
* Copyright (C) 2001-2002 SnapGear Inc. <www.snapgear.com> * Copyright (C) 2001-2002 SnapGear Inc. <www.snapgear.com>
* *
...@@ -50,12 +50,6 @@ ...@@ -50,12 +50,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include "mcfserial.h" #include "mcfserial.h"
/*
* the only event we use
*/
#undef RS_EVENT_WRITE_WAKEUP
#define RS_EVENT_WRITE_WAKEUP 0
struct timer_list mcfrs_timer_struct; struct timer_list mcfrs_timer_struct;
/* /*
...@@ -443,12 +437,10 @@ static void mcfrs_offintr(void *private) ...@@ -443,12 +437,10 @@ static void mcfrs_offintr(void *private)
if (!tty) if (!tty)
return; return;
if (test_and_clear_bit(RS_EVENT_WRITE_WAKEUP, &info->event)) { if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) &&
if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup)
tty->ldisc.write_wakeup) (tty->ldisc.write_wakeup)(tty);
(tty->ldisc.write_wakeup)(tty); wake_up_interruptible(&tty->write_wait);
wake_up_interruptible(&tty->write_wait);
}
} }
......
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