Merge branches 'release' and 'autoload' into release

[linux-2.6-omap-h63xx.git] / drivers / scsi / libsas / sas_dump.c

diff --git a/drivers/scsi/libsas/sas_dump.c b/drivers/scsi/libsas/sas_dump.c
index f1246d2c9bef83a90847fd5399c546d078149391..bf34a236f946b62711f4b3111e476eac6594f5c1 100644 (file)
--- a/drivers/scsi/libsas/sas_dump.c
+++ b/drivers/scsi/libsas/sas_dump.c
@@ -56,7 +56,7 @@ void sas_dprint_phye(int phyid, enum phy_event pe)
 
 void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he)
 {
-       SAS_DPRINTK("ha %s: %s event\n", pci_name(sas_ha->pcidev),
+       SAS_DPRINTK("ha %s: %s event\n", sas_ha->dev->bus_id,
                    sas_hae_str[he]);
 }