瀏覽代碼

libata: fix boot panic with SATAPI devices on non-SFF HBAs

The kernel now panics reliably on boot if you have a SATAPI device
connected.

The problem was introduced by the libata merge trying to pull out all
the SFF code into a separate module.  Unfortunately, if you're a satapi
device you usually need to call atapi_request_sense, which has a bare
invocation of a SFF callback which is NULL on non-SFF HBAs.  Fix this by
making the call conditional.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
James Bottomley 17 年之前
父節點
當前提交
855d854a33
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      drivers/ata/libata-scsi.c

+ 2 - 1
drivers/ata/libata-scsi.c

@@ -2394,7 +2394,8 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
 	memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
 	memset(cmd->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
 
 
 #ifdef CONFIG_ATA_SFF
 #ifdef CONFIG_ATA_SFF
-	ap->ops->sff_tf_read(ap, &qc->tf);
+	if (ap->ops->sff_tf_read)
+		ap->ops->sff_tf_read(ap, &qc->tf);
 #endif
 #endif
 
 
 	/* fill these in, for the case where they are -not- overwritten */
 	/* fill these in, for the case where they are -not- overwritten */