|
@@ -295,11 +295,14 @@ static void sas_discover_domain(struct work_struct *work)
|
|
case FANOUT_DEV:
|
|
case FANOUT_DEV:
|
|
error = sas_discover_root_expander(dev);
|
|
error = sas_discover_root_expander(dev);
|
|
break;
|
|
break;
|
|
-#ifdef CONFIG_SCSI_SAS_ATA
|
|
|
|
case SATA_DEV:
|
|
case SATA_DEV:
|
|
case SATA_PM:
|
|
case SATA_PM:
|
|
|
|
+#ifdef CONFIG_SCSI_SAS_ATA
|
|
error = sas_discover_sata(dev);
|
|
error = sas_discover_sata(dev);
|
|
break;
|
|
break;
|
|
|
|
+#else
|
|
|
|
+ SAS_DPRINTK("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");
|
|
|
|
+ /* Fall through */
|
|
#endif
|
|
#endif
|
|
default:
|
|
default:
|
|
error = -ENXIO;
|
|
error = -ENXIO;
|