diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 14:42:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-31 14:42:07 -0700 |
| commit | dd1a47c21ee4f4f682285ad9d4624d2cec436f93 (patch) | |
| tree | eb25419d0c4a3e044aa8f3d0d2ffe87c02ad0a70 /drivers/s390/cio/chsc.c | |
| parent | 22db37ec5fd51b0c77b1dd5751b1cdc2672c08d6 (diff) | |
| parent | 7b7db1b59563aebe2f4d2ba850468afb2c87c82a (diff) | |
| download | linux-3.10-dd1a47c21ee4f4f682285ad9d4624d2cec436f93.tar.gz linux-3.10-dd1a47c21ee4f4f682285ad9d4624d2cec436f93.tar.bz2 linux-3.10-dd1a47c21ee4f4f682285ad9d4624d2cec436f93.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: unsolicited interrupts during sense pgid.
[S390] cio: no path after machine check.
[S390] cio: kernel stack overflow.
[S390] dasd: fix device shutdown process.
[S390] broken copy_in_user function.
Diffstat (limited to 'drivers/s390/cio/chsc.c')
| -rw-r--r-- | drivers/s390/cio/chsc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index 61ce3f1d522..c28444af091 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c @@ -238,8 +238,6 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) /* Check for single path devices. */ if (sch->schib.pmcw.pim == 0x80) goto out_unreg; - if (sch->vpm == mask) - goto out_unreg; if ((sch->schib.scsw.actl & SCSW_ACTL_DEVACT) && (sch->schib.scsw.actl & SCSW_ACTL_SCHACT) && @@ -258,6 +256,8 @@ s390_subchannel_remove_chpid(struct device *dev, void *data) /* trigger path verification. */ if (sch->driver && sch->driver->verify) sch->driver->verify(&sch->dev); + else if (sch->vpm == mask) + goto out_unreg; out_unlock: spin_unlock_irq(&sch->lock); return 0; @@ -1391,10 +1391,8 @@ new_channel_path(int chpid) /* fill in status, etc. */ chp->id = chpid; chp->state = 1; - chp->dev = (struct device) { - .parent = &css[0]->device, - .release = chp_release, - }; + chp->dev.parent = &css[0]->device; + chp->dev.release = chp_release; snprintf(chp->dev.bus_id, BUS_ID_SIZE, "chp0.%x", chpid); /* Obtain channel path description and fill it in. */ |