aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/char')
-rw-r--r--drivers/s390/char/con3215.c2
-rw-r--r--drivers/s390/char/raw3270.c2
2 files changed, 2 insertions, 2 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);
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 383d6432a1a8..24a08e8f19e1 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1274,7 +1274,7 @@ void raw3270_pm_unfreeze(struct raw3270_view *view)
1274 1274
1275 rp = view->dev; 1275 rp = view->dev;
1276 if (rp && test_bit(RAW3270_FLAGS_FROZEN, &rp->flags)) 1276 if (rp && test_bit(RAW3270_FLAGS_FROZEN, &rp->flags))
1277 ccw_device_force_console(); 1277 ccw_device_force_console(rp->cdev);
1278#endif 1278#endif
1279} 1279}
1280 1280