1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 8f4222640bd6..fcab9b79d9fb 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -1096,16 +1096,17 @@ static int uas_probe(struct usb_interface *intf, const struct usb_device_id *id)
         if (result)
                 goto free_streams;
 
+        usb_set_intfdata(intf, shost);
         result = scsi_add_host(shost, &intf->dev);
         if (result)
                 goto free_streams;
 
         scsi_scan_host(shost);
-        usb_set_intfdata(intf, shost);
         return result;
 
 free_streams:
         uas_free_streams(devinfo);
+        usb_set_intfdata(intf, NULL);
 set_alt0:
         usb_set_interface(udev, intf->altsetting[0].desc.bInterfaceNumber, 0);
         if (shost)