This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / scsi_transport_spi.c

diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index f01133b..57fe7b1 100644 (file)
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -361,8 +361,9 @@ static ssize_t store_spi_host_signalling(struct class_device *cdev,
        enum spi_signal_type type = spi_signal_to_value(buf);
 
        if (type != SPI_SIGNAL_UNKNOWN)
-               i->f->set_signalling(shost, type);
+               return count;
 
+       i->f->set_signalling(shost, type);
        return count;
 }
 static CLASS_DEVICE_ATTR(signalling, S_IRUGO | S_IWUSR,
@@ -634,11 +635,7 @@ spi_dv_device_internal(struct scsi_request *sreq, u8 *buffer)
        /* OK, now we have our initial speed set by the read only inquiry
         * test, now try an echo buffer test (if the device allows it) */
 
-       len = 0;
-       if (sdev->ppr)
-               len = spi_dv_device_get_echo_buffer(sreq, buffer);
-
-       if (len == 0) {
+       if ((len = spi_dv_device_get_echo_buffer(sreq, buffer)) == 0) {
                SPI_PRINTK(sdev->sdev_target, KERN_INFO, "Domain Validation skipping write tests\n");
                return;
        }