Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / scsi / sr_ioctl.c

diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index 3cd8ffbad5776dbcee289f1465022602e3897199..8be30554119bf0c9e88bc1ffef7cbbab33448676 100644 (file)
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -307,7 +307,7 @@ int sr_drive_status(struct cdrom_device_info *cdi, int slot)
                /* we have no changer support */
                return -EINVAL;
        }
-       if (0 == sr_test_unit_ready(cd->device, &sshdr))
+       if (!scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES, &sshdr))
                return CDS_DISC_OK;
 
        /* SK/ASC/ASCQ of 2/4/1 means "unit is becoming ready" */