[patch for 2.6.31? 2/2] gigaset: really fix chars_in_buffer

[patch for 2.6.31? 2/2] gigaset: really fix chars_in_buffer

[akpm]

From: Tilman Schmidt <tilman@imap.cc>

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

Signed-off-by: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/isdn/gigaset/interface.c |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff -puN drivers/isdn/gigaset/interface.c~gigaset-really-fix-chars_in_buffer drivers/isdn/gigaset/interface.c
--- a/drivers/isdn/gigaset/interface.c~gigaset-really-fix-chars_in_buffer
+++ a/drivers/isdn/gigaset/interface.c
@@ -408,33 +408,28 @@ static int if_write_room(struct tty_stru
 	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);
_

Re: [patch for 2.6.31? 2/2] gigaset: really fix chars_in_buffer

[David Miller]

From: akpm@linux-foundation.org
Date: Thu, 06 Aug 2009 15:19:32 -0700

> From: Tilman Schmidt <tilman@imap.cc>
> 
> The tty_operation chars_in_buffer() is not allowed to return a negative
> value to signal an error.  Corrects the problem flagged by commit
> 23198fda7182969b619613a555f8645fdc3dc334, "tty: fix chars_in_buffers".
> 
> Signed-off-by: Tilman Schmidt <tilman@imap.cc>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

I was letting Alan Cox handle changes in this area since it's
TTY stuff, and thus it probably should go to the new TTY
mad man, CC:'d :-)

> ---
> 
>  drivers/isdn/gigaset/interface.c |   19 +++++++------------
>  1 file changed, 7 insertions(+), 12 deletions(-)
> 
> diff -puN drivers/isdn/gigaset/interface.c~gigaset-really-fix-chars_in_buffer drivers/isdn/gigaset/interface.c
> --- a/drivers/isdn/gigaset/interface.c~gigaset-really-fix-chars_in_buffer
> +++ a/drivers/isdn/gigaset/interface.c
> @@ -408,33 +408,28 @@ static int if_write_room(struct tty_stru
>  	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);
> _

Re: [patch for 2.6.31? 2/2] gigaset: really fix chars_in_buffer

[Greg KH]

On Thu, Aug 06, 2009 at 08:22:27PM -0700, David Miller wrote:
> From: akpm@linux-foundation.org
> Date: Thu, 06 Aug 2009 15:19:32 -0700
> 
> > From: Tilman Schmidt <tilman@imap.cc>
> > 
> > The tty_operation chars_in_buffer() is not allowed to return a negative
> > value to signal an error.  Corrects the problem flagged by commit
> > 23198fda7182969b619613a555f8645fdc3dc334, "tty: fix chars_in_buffers".
> > 
> > Signed-off-by: Tilman Schmidt <tilman@imap.cc>
> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> I was letting Alan Cox handle changes in this area since it's
> TTY stuff, and thus it probably should go to the new TTY
> mad man, CC:'d :-)

Thanks, I'll queue it up.

greg k-h