Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / drivers / scsi / libsas / sas_discover.c

diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 31b9af224243d2e73c54bf2b4c8d19944eee0c30..facc5bfcf7db673ae9f994a6e2c5deb1507bcd9a 100644 (file)
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -169,7 +169,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev)
                if (res) {
                        printk("sas: driver on pcidev %s cannot handle "
                               "device %llx, error:%d\n",
-                              sas_ha->dev->bus_id,
+                              dev_name(sas_ha->dev),
                               SAS_ADDR(dev->sas_addr), res);
                }
        }
@@ -295,11 +295,14 @@ static void sas_discover_domain(struct work_struct *work)
        case FANOUT_DEV:
                error = sas_discover_root_expander(dev);
                break;
-#ifdef CONFIG_SCSI_SAS_ATA
        case SATA_DEV:
        case SATA_PM:
+#ifdef CONFIG_SCSI_SAS_ATA
                error = sas_discover_sata(dev);
                break;
+#else
+               SAS_DPRINTK("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");
+               /* Fall through */
 #endif
        default:
                error = -ENXIO;