--- drivers/scsi/scsi_lib.c

+++ drivers/scsi/scsi_lib.c

@@ -400,10 +400,15 @@ static inline int scsi_host_is_busy(stru

static void scsi_run_queue(struct request_queue *q)

{

struct scsi_device *sdev = q->queuedata;

- struct Scsi_Host *shost = sdev->host;

+ struct Scsi_Host *shost;

LIST_HEAD(starved_list);

unsigned long flags;

+ /* if the device is dead, sdev will be NULL, so no queue to run */

+ if (!sdev)

+ return;

+

+ shost = sdev->host;

if (scsi_target(sdev)->single_lun)

scsi_single_lun_run(sdev);

@@ -773,8 +778,14 @@ void scsi_io_completion(struct scsi_cmnd

* we already took a copy of the original into rq->errors which

* is what gets returned to the user

*/

- if (sense_valid && sshdr.sense_key == RECOVERED_ERROR) {

- if (!(req->cmd_flags & REQ_QUIET))

+ if (sense_valid && (sshdr.sense_key == RECOVERED_ERROR)) {

+ /* if ATA PASS-THROUGH INFORMATION AVAILABLE skip

+ * print since caller wants ATA registers. Only occurs on

+ * SCSI ATA PASS_THROUGH commands when CK_COND=1

+ */

+ if ((sshdr.asc == 0x0) && (sshdr.ascq == 0x1d))

+ ;

+ else if (!(req->cmd_flags & REQ_QUIET))

scsi_print_sense("", cmd);

result = 0;

/* BLOCK_PC may have set error */

@@ -1630,9 +1641,8 @@ struct request_queue *__scsi_alloc_queue

blk_queue_max_segment_size(q, dma_get_max_seg_size(dev));

- /* New queue, no concurrency on queue_flags */

if (!shost->use_clustering)

- queue_flag_clear_unlocked(QUEUE_FLAG_CLUSTER, q);

+ q->limits.cluster = 0;

/*

* set a reasonable default alignment on word boundaries: the

@@ -2426,7 +2436,8 @@ scsi_internal_device_unblock(struct scsi

sdev->sdev_state = SDEV_RUNNING;

else if (sdev->sdev_state == SDEV_CREATED_BLOCK)

sdev->sdev_state = SDEV_CREATED;

- else

+ else if (sdev->sdev_state != SDEV_CANCEL &&

+ sdev->sdev_state != SDEV_OFFLINE)

return -EINVAL;

spin_lock_irqsave(q->queue_lock, flags);