1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 07464873ab89..d05fc23b4d5b 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -670,8 +670,8 @@ static struct domain_device *sas_ex_discover_end_dev(
                        sizeof(struct dev_to_host_fis));
 
                 rphy = sas_end_device_alloc(phy->port);
-                /* FIXME: error handling */
-                BUG_ON(!rphy);
+                if (unlikely(!rphy))
+                        goto out_free;
 
                 sas_init_dev(child);