From 1e8b8b3226280a2d4d52af9444ca2c57536fbea0 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Fri, 12 Oct 2007 16:11:52 +0200 Subject: [PATCH] --- yaml --- r: 67642 b: refs/heads/master c: a2e53801971edbdaac4411760d893b8b65646987 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/s390/char/con3215.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 70a587ac62d7..f38b1a9e07e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c41fbc69654dd74339f76ea88054fe41e3c1b7a8 +refs/heads/master: a2e53801971edbdaac4411760d893b8b65646987 diff --git a/trunk/drivers/s390/char/con3215.c b/trunk/drivers/s390/char/con3215.c index 6000bdee4082..0e1f35c9ed9d 100644 --- a/trunk/drivers/s390/char/con3215.c +++ b/trunk/drivers/s390/char/con3215.c @@ -667,6 +667,9 @@ raw3215_probe (struct ccw_device *cdev) struct raw3215_info *raw; int line; + /* Console is special. */ + if (raw3215[0] && (cdev->dev.driver_data == raw3215[0])) + return 0; raw = kmalloc(sizeof(struct raw3215_info) + RAW3215_INBUF_SIZE, GFP_KERNEL|GFP_DMA); if (raw == NULL)