diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index c1f91b1..75247a1 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -790,11 +790,13 @@
 		if (res)
 			goto out_free;
 
-		rphy = sas_end_device_alloc(phy->port);
-		if (unlikely(!rphy))
-			goto out_free;
-
 		sas_init_dev(child);
+		res = sas_ata_init(child);
+		if (res)
+			goto out_free;
+		rphy = sas_end_device_alloc(phy->port);
+		if (!rphy)
+			goto out_free;
 
 		child->rphy = rphy;
 		get_device(&rphy->dev);