diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2009-12-18 17:43:15 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2009-12-18 17:43:31 +0100 |
| commit | ffa8d2a3e80a3f0dee9886947dbd506d2bb226d2 (patch) | |
| tree | 984a55405b44538777701596552dc1c50510bb1c | |
| parent | 70ee9518cfc8baec618e69e4ef22566dcb2f29d3 (diff) | |
| download | op-kernel-dev-ffa8d2a3e80a3f0dee9886947dbd506d2bb226d2.zip op-kernel-dev-ffa8d2a3e80a3f0dee9886947dbd506d2bb226d2.tar.gz | |
[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 <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/s390/cio/device.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 73901c9..a6c7d542 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); |
