diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2007-10-12 16:11:52 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-10-12 16:13:11 +0200 |
| commit | a2e53801971edbdaac4411760d893b8b65646987 (patch) | |
| tree | dd470d967d0ca375fbc4ba4e0e50daf6017f2861 /drivers/s390/char | |
| parent | c41fbc69654dd74339f76ea88054fe41e3c1b7a8 (diff) | |
| download | kernel-crypto-a2e53801971edbdaac4411760d893b8b65646987.tar.gz kernel-crypto-a2e53801971edbdaac4411760d893b8b65646987.tar.xz kernel-crypto-a2e53801971edbdaac4411760d893b8b65646987.zip | |
[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 <cornelia.huck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char')
| -rw-r--r-- | drivers/s390/char/con3215.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c index 6000bdee408..0e1f35c9ed9 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) |