X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fs390%2Fchar%2Fcon3215.c;h=0e1f35c9ed9d4e0be6dc928d0d3bf69182799149;hb=46015977e70f672ae6b20a1b5fb1e361208365ba;hp=6000bdee4082830b87e978d0b5538e2765ff2c98;hpb=0278ef8b484a71917bd4f03a763285cdaac10954;p=linux-2.6

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 6000bdee40..0e1f35c9ed 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)