linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] tty: add missing tty_port_tty_get() call to raw3215_wakeup
@ 2012-04-17 11:16 Heiko Carstens
  2012-04-17 12:35 ` Jiri Slaby
  0 siblings, 1 reply; 2+ messages in thread
From: Heiko Carstens @ 2012-04-17 11:16 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: linux-next, Martin Schwidefsky, Jiri Slaby

Fix compile error caused by "TTY: con3215, use tty from tty_port":

 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[1]: *** [drivers/s390/char/con3215.o] Error 1
make: *** [drivers/s390/char/] Error 2

Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
 drivers/s390/char/con3215.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index e928e04..6c0116d 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -336,7 +336,11 @@ 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 = tty_port_tty_get(&raw->port);
+	tty_wakeup(tty);
+	tty_kref_put(tty);
 }
 
 /*
-- 
1.7.9.6

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] tty: add missing tty_port_tty_get() call to raw3215_wakeup
  2012-04-17 11:16 [PATCH -next] tty: add missing tty_port_tty_get() call to raw3215_wakeup Heiko Carstens
@ 2012-04-17 12:35 ` Jiri Slaby
  0 siblings, 0 replies; 2+ messages in thread
From: Jiri Slaby @ 2012-04-17 12:35 UTC (permalink / raw)
  To: Heiko Carstens; +Cc: Greg Kroah-Hartman, linux-next, Martin Schwidefsky

On 04/17/2012 01:16 PM, Heiko Carstens wrote:
> Fix compile error caused by "TTY: con3215, use tty from tty_port":
> 
>  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[1]: *** [drivers/s390/char/con3215.o] Error 1
> make: *** [drivers/s390/char/] Error 2

Aha, that's because I rebased the tasklet removal patch on the top of
the other two patches so I don't see the error in my local tree.

> Cc: Jiri Slaby <jslaby@suse.cz>

Acked-by: Jiri Slaby <jslaby@suse.cz>

and thanks.

> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
> ---
>  drivers/s390/char/con3215.c |    6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
> index e928e04..6c0116d 100644
> --- a/drivers/s390/char/con3215.c
> +++ b/drivers/s390/char/con3215.c
> @@ -336,7 +336,11 @@ 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 = tty_port_tty_get(&raw->port);
> +	tty_wakeup(tty);
> +	tty_kref_put(tty);
>  }
>  
>  /*
> 
-- 
js
suse labs

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-17 12:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-17 11:16 [PATCH -next] tty: add missing tty_port_tty_get() call to raw3215_wakeup Heiko Carstens
2012-04-17 12:35 ` Jiri Slaby

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).