diff options
| -rw-r--r-- | drivers/ata/libata-scsi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index d050e073e570..3f91c01c217f 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
| @@ -2552,8 +2552,11 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc) | |||
| 2552 | * | 2552 | * |
| 2553 | * If door lock fails, always clear sdev->locked to | 2553 | * If door lock fails, always clear sdev->locked to |
| 2554 | * avoid this infinite loop. | 2554 | * avoid this infinite loop. |
| 2555 | * | ||
| 2556 | * This may happen before SCSI scan is complete. Make | ||
| 2557 | * sure qc->dev->sdev isn't NULL before dereferencing. | ||
| 2555 | */ | 2558 | */ |
| 2556 | if (qc->cdb[0] == ALLOW_MEDIUM_REMOVAL) | 2559 | if (qc->cdb[0] == ALLOW_MEDIUM_REMOVAL && qc->dev->sdev) |
| 2557 | qc->dev->sdev->locked = 0; | 2560 | qc->dev->sdev->locked = 0; |
| 2558 | 2561 | ||
| 2559 | qc->scsicmd->result = SAM_STAT_CHECK_CONDITION; | 2562 | qc->scsicmd->result = SAM_STAT_CHECK_CONDITION; |
