Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6] / drivers / scsi / sr.c

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 50ba492502035afe85d0bd62899b02c132022c63..27f5bfd1def343e205c2710a587571650026410f 100644 (file)
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -163,6 +163,32 @@ static void scsi_cd_put(struct scsi_cd *cd)
        mutex_unlock(&sr_ref_mutex);
 }
 
+/* identical to scsi_test_unit_ready except that it doesn't
+ * eat the NOT_READY returns for removable media */
+int sr_test_unit_ready(struct scsi_device *sdev, struct scsi_sense_hdr *sshdr)
+{
+       int retries = MAX_RETRIES;
+       int the_result;
+       u8 cmd[] = {TEST_UNIT_READY, 0, 0, 0, 0, 0 };
+
+       /* issue TEST_UNIT_READY until the initial startup UNIT_ATTENTION
+        * conditions are gone, or a timeout happens
+        */
+       do {
+               the_result = scsi_execute_req(sdev, cmd, DMA_NONE, NULL,
+                                             0, sshdr, SR_TIMEOUT,
+                                             retries--);
+               if (scsi_sense_valid(sshdr) &&
+                   sshdr->sense_key == UNIT_ATTENTION)
+                       sdev->changed = 1;
+
+       } while (retries > 0 &&
+                (!scsi_status_is_good(the_result) ||
+                 (scsi_sense_valid(sshdr) &&
+                  sshdr->sense_key == UNIT_ATTENTION)));
+       return the_result;
+}
+
 /*
  * This function checks to see if the media has been changed in the
  * CDROM drive.  It is possible that we have already sensed a change,
@@ -185,8 +211,7 @@ static int sr_media_change(struct cdrom_device_info *cdi, int slot)
        }
 
        sshdr =  kzalloc(sizeof(*sshdr), GFP_KERNEL);
-       retval = scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES,
-                                     sshdr);
+       retval = sr_test_unit_ready(cd->device, sshdr);
        if (retval || (scsi_sense_valid(sshdr) &&
                       /* 0x3a is medium not present */
                       sshdr->asc == 0x3a)) {
@@ -601,6 +626,7 @@ static int sr_probe(struct device *dev)
        cd->disk = disk;
        cd->capacity = 0x1fffff;
        cd->device->changed = 1;        /* force recheck CD type */
+       cd->previous_state = 1;
        cd->use = 1;
        cd->readcd_known = 0;
        cd->readcd_cdda = 0;
@@ -647,24 +673,20 @@ fail:
 static void get_sectorsize(struct scsi_cd *cd)
 {
        unsigned char cmd[10];
-       unsigned char *buffer;
+       unsigned char buffer[8];
        int the_result, retries = 3;
        int sector_size;
        struct request_queue *queue;
 
-       buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
-       if (!buffer)
-               goto Enomem;
-
        do {
                cmd[0] = READ_CAPACITY;
                memset((void *) &cmd[1], 0, 9);
-               memset(buffer, 0, 8);
+               memset(buffer, 0, sizeof(buffer));
 
                /* Do the command and wait.. */
                the_result = scsi_execute_req(cd->device, cmd, DMA_FROM_DEVICE,
-                                             buffer, 8, NULL, SR_TIMEOUT,
-                                             MAX_RETRIES);
+                                             buffer, sizeof(buffer), NULL,
+                                             SR_TIMEOUT, MAX_RETRIES);
 
                retries--;
 
@@ -719,24 +741,16 @@ static void get_sectorsize(struct scsi_cd *cd)
 
        queue = cd->device->request_queue;
        blk_queue_hardsect_size(queue, sector_size);
-out:
-       kfree(buffer);
-       return;
 
-Enomem:
-       cd->capacity = 0x1fffff;
-       cd->device->sector_size = 2048; /* A guess, just in case */
-       goto out;
+       return;
 }
 
 static void get_capabilities(struct scsi_cd *cd)
 {
        unsigned char *buffer;
        struct scsi_mode_data data;
-       unsigned char cmd[MAX_COMMAND_SIZE];
        struct scsi_sense_hdr sshdr;
-       unsigned int the_result;
-       int retries, rc, n;
+       int rc, n;
 
        static const char *loadmech[] =
        {
@@ -758,23 +772,8 @@ static void get_capabilities(struct scsi_cd *cd)
                return;
        }
 
-       /* issue TEST_UNIT_READY until the initial startup UNIT_ATTENTION
-        * conditions are gone, or a timeout happens
-        */
-       retries = 0;
-       do {
-               memset((void *)cmd, 0, MAX_COMMAND_SIZE);
-               cmd[0] = TEST_UNIT_READY;
-
-               the_result = scsi_execute_req (cd->device, cmd, DMA_NONE, NULL,
-                                              0, &sshdr, SR_TIMEOUT,
-                                              MAX_RETRIES);
-
-               retries++;
-       } while (retries < 5 && 
-                (!scsi_status_is_good(the_result) ||
-                 (scsi_sense_valid(&sshdr) &&
-                  sshdr.sense_key == UNIT_ATTENTION)));
+       /* eat unit attentions */
+       sr_test_unit_ready(cd->device, &sshdr);
 
        /* ask for mode page 0x2a */
        rc = scsi_mode_sense(cd->device, 0, 0x2a, buffer, 128,