diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 05:13:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-20 05:13:31 -0500 |
| commit | ff607748590fba14aecedb0d50edc4ada98d4302 (patch) | |
| tree | 986e0a3abe922713069a8e8bc913043fed89a39a /drivers/s390/cio/device_status.c | |
| parent | db024d5398cd332023896caf70530564b15ec88e (diff) | |
| parent | 6aff8f1f07a7fff48121d1ad4a550f3af24ccc81 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/s390/cio/device_status.c')
| -rw-r--r-- | drivers/s390/cio/device_status.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c index dad4dd9887c9..6c762b43f921 100644 --- a/drivers/s390/cio/device_status.c +++ b/drivers/s390/cio/device_status.c | |||
| @@ -317,7 +317,6 @@ ccw_device_do_sense(struct ccw_device *cdev, struct irb *irb) | |||
| 317 | /* | 317 | /* |
| 318 | * We have ending status but no sense information. Do a basic sense. | 318 | * We have ending status but no sense information. Do a basic sense. |
| 319 | */ | 319 | */ |
| 320 | sch = to_subchannel(cdev->dev.parent); | ||
| 321 | sch->sense_ccw.cmd_code = CCW_CMD_BASIC_SENSE; | 320 | sch->sense_ccw.cmd_code = CCW_CMD_BASIC_SENSE; |
| 322 | sch->sense_ccw.cda = (__u32) __pa(cdev->private->irb.ecw); | 321 | sch->sense_ccw.cda = (__u32) __pa(cdev->private->irb.ecw); |
| 323 | sch->sense_ccw.count = SENSE_MAX_COUNT; | 322 | sch->sense_ccw.count = SENSE_MAX_COUNT; |