diff --git a/[refs] b/[refs] index 5e637aef3ae3..b8d3b15dc95c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c8fdc591057956c2ecbba1371a48b8857fe6d9d +refs/heads/master: 13ba9bcbfd6741e4c01ac5a505888b7b3a6d99da diff --git a/trunk/drivers/scsi/scsi_sysfs.c b/trunk/drivers/scsi/scsi_sysfs.c index 0088c4dd7c6a..8e880ef8b797 100644 --- a/trunk/drivers/scsi/scsi_sysfs.c +++ b/trunk/drivers/scsi/scsi_sysfs.c @@ -995,7 +995,7 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev) int scsi_is_sdev_device(const struct device *dev) { - return dev->release == scsi_device_dev_release; + return dev->type == &scsi_dev_type; } EXPORT_SYMBOL(scsi_is_sdev_device);