From: Sebastian Ott Date: Fri, 18 Dec 2009 16:43:15 +0000 (+0100) Subject: [S390] cio: fix drvdata usage for the console subchannel X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ffa8d2a3e80a3f0dee9886947dbd506d2bb226d2;p=linux.git [S390] cio: fix drvdata usage for the console subchannel Using dev_set_drvdata prior to device_register will force the driver core to kmalloc its private data. Since we use this for the console subchannel lets set the drvdata before taking the subchannels spinlock. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky --- diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 73901c9e260ff..a6c7d5426fb2b 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1519,6 +1519,7 @@ static int ccw_device_console_enable(struct ccw_device *cdev, sch->driver = &io_subchannel_driver; /* Initialize the ccw_device structure. */ cdev->dev.parent= &sch->dev; + sch_set_cdev(sch, cdev); io_subchannel_recog(cdev, sch); /* Now wait for the async. recognition to come to an end. */ spin_lock_irq(cdev->ccwlock);