From: Cornelia Huck Date: Fri, 12 Oct 2007 14:11:52 +0000 (+0200) Subject: [S390] 3215: Handle special console device. X-Git-Tag: v3.12-rc1~26421 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2e53801971edbdaac4411760d893b8b65646987;p=kernel%2Fkernel-generic.git [S390] 3215: Handle special console device. The early console device is special as it already has all needed data set and raw3215[0] allocated from con3215_init(). Therefore, it needs special treatment in the probe function so it can be matched with the 3215 driver which is already owning it. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 6000bde..0e1f35c 100644 --- a/drivers/s390/char/con3215.c +++ b/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)