[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-s390
Subject:    Re: [PATCH] s390: fix build failure in con3215.c tty wakeup tasklet
From:       Heiko Carstens <heiko.carstens () de ! ibm ! com>
Date:       2012-04-17 16:14:55
Message-ID: 20120417161455.GB4382 () osiris ! boeblingen ! de ! ibm ! com
[Download RAW message or body]

On Tue, Apr 17, 2012 at 12:07:09PM -0400, Paul Gortmaker wrote:
> Commit 86b26007a37d81e7aca242bb5b649473f8f81297 (tty-next)
> 
>     "TTY: con3215, use tty from tty_port"
> 
> removed the tty struct from the raw struct, causing:
> 
>   CC      drivers/s390/char/con3215.o
> drivers/s390/char/con3215.c: In function 'raw3215_wakeup':
> drivers/s390/char/con3215.c:339:16: error: 'struct raw3215_info' has no member named 'tty'
> make[2]: *** [drivers/s390/char/con3215.o] Error 1

...

> diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
> index e928e04..759c43c 100644
> --- a/drivers/s390/char/con3215.c
> +++ b/drivers/s390/char/con3215.c
> @@ -336,7 +336,13 @@ static inline void raw3215_try_io(struct raw3215_info *raw)
>  static void raw3215_wakeup(unsigned long data)
>  {
>  	struct raw3215_info *raw = (struct raw3215_info *) data;
> -	tty_wakeup(raw->tty);
> +	struct tty_struct *tty = tty_port_tty_get(&raw->port);
> +
> +	if (tty == NULL)
> +		return;
> +
> +	tty_wakeup(tty);
> +	tty_kref_put(tty);

Yep, I posted a similar patch earlier:
http://marc.info/?l=linux-next&m=133466152209052&w=2

The NULL check is not necessary, because "it cannot happen" ;)

Thanks,
Heiko

--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]