Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4304f2d authored by Tilman Schmidt's avatar Tilman Schmidt Committed by Live-CD User
Browse files

tty: gigaset: really fix chars_in_buffer 



The tty_operation chars_in_buffer() is not allowed to return a negative
value to signal an error.  Corrects the problem flagged by commit
23198fda, "tty: fix chars_in_buffers".

Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 78f28b7c

drivers/isdn/gigaset/interface.c

+7 −12
Original line number Diff line number Diff line
@@ -408,33 +408,28 @@ static int if_write_room(struct tty_struct *tty) 
	return retval;

}



/* FIXME: This function does not have error returns */



static int if_chars_in_buffer(struct tty_struct *tty)

{

	struct cardstate *cs;

	int retval = -ENODEV;

	int retval = 0;



	cs = (struct cardstate *) tty->driver_data;

	if (!cs) {

		pr_err("%s: no cardstate\n", __func__);

		return -ENODEV;

		return 0;

	}



	gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);



	if (mutex_lock_interruptible(&cs->mutex))

		return -ERESTARTSYS; // FIXME -EINTR?

	mutex_lock(&cs->mutex);



	if (!cs->connected) {

	if (!cs->connected)

		gig_dbg(DEBUG_IF, "not connected");

		retval = -ENODEV;

	} else if (!cs->open_count)

	else if (!cs->open_count)

		dev_warn(cs->dev, "%s: device not opened\n", __func__);

	else if (cs->mstate != MS_LOCKED) {

	else if (cs->mstate != MS_LOCKED)

		dev_warn(cs->dev, "can't write to unlocked device\n");

		retval = -EBUSY;

	} else

	else

		retval = cs->ops->chars_in_buffer(cs);



	mutex_unlock(&cs->mutex);