aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char/con3215.c
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2013-04-13 06:56:51 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-04-17 08:07:31 -0400
commitf10ccca7a555f5e80ed7ecff58e7dfdab03860da (patch)
tree1b6255b840b1f3bbcc25cc3129bc004c655fe2e5 /drivers/s390/char/con3215.c
parent188561a462d3b82451d6ba09e2e32c9ba2c9938c (diff)
s390/cio: ccw_device_force_console don't use static variable
force_console is used to wake up the CCW based console device to print a panic message in case something goes wrong in a suspend or resume cycle. Stop using the static console_subchannel and add a parameter to this function to specify which ccw device we have to wake up. Reviewed-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/con3215.c')
-rw-r--r--drivers/s390/char/con3215.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 0d79eec799f1..eb5d22795c47 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -858,7 +858,7 @@ static void con3215_flush(void)
858 raw = raw3215[0]; /* console 3215 is the first one */ 858 raw = raw3215[0]; /* console 3215 is the first one */
859 if (raw->port.flags & ASYNC_SUSPENDED) 859 if (raw->port.flags & ASYNC_SUSPENDED)
860 /* The console is still frozen for suspend. */ 860 /* The console is still frozen for suspend. */
861 if (ccw_device_force_console()) 861 if (ccw_device_force_console(raw->cdev))
862 /* Forcing didn't work, no panic message .. */ 862 /* Forcing didn't work, no panic message .. */
863 return; 863 return;
864 spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags); 864 spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);