diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-08-05 00:30:02 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-20 11:15:22 -0700 |
| commit | 92aac7e259360f1cfaeb7700d9e2de27f824e78a (patch) | |
| tree | 5d694bf0cb45e0eb6fa2a211f39e970d1add6f39 | |
| parent | a2c7bbce938caa71cd5c15db138974f1c88f1bd7 (diff) | |
| download | lwn-92aac7e259360f1cfaeb7700d9e2de27f824e78a.tar.gz lwn-92aac7e259360f1cfaeb7700d9e2de27f824e78a.zip | |
SCSI: scsi_transport_spi: fix oops in revalidate
commit e8bac9e0647dd04c83fd0bfe7cdfe2f6dfb100d0 upstream
The class_device->device conversion is causing an oops in revalidate
because it's assuming that the device_for_each_child iterator will only
return struct scsi_device children. The conversion made all former
class_devices children of the device as well, so this assumption is
broken. Fix it.
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/scsi/scsi_transport_spi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index 1fb60313a516..945e1fbb1a35 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c @@ -360,12 +360,14 @@ spi_transport_rd_attr(rti, "%d\n"); spi_transport_rd_attr(pcomp_en, "%d\n"); spi_transport_rd_attr(hold_mcs, "%d\n"); -/* we only care about the first child device so we return 1 */ +/* we only care about the first child device that's a real SCSI device + * so we return 1 to terminate the iteration when we find it */ static int child_iter(struct device *dev, void *data) { - struct scsi_device *sdev = to_scsi_device(dev); + if (!scsi_is_sdev_device(dev)) + return 0; - spi_dv_device(sdev); + spi_dv_device(to_scsi_device(dev)); return 1; } |