1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index fbf539468205..e5d6146937fa 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -804,18 +804,15 @@ int rndis_filter_device_add(struct hv_device *dev,
         /* Send the rndis initialization message */
         ret = rndis_filter_init_device(rndis_device);
         if (ret != 0) {
-                /*
-                 * TODO: If rndis init failed, we will need to shut down the
-                 * channel
-                 */
+                rndis_filter_device_remove(dev);
+                return ret;
         }
 
         /* Get the mac address */
         ret = rndis_filter_query_device_mac(rndis_device);
         if (ret != 0) {
-                /*
-                 * TODO: shutdown rndis device and the channel
-                 */
+                rndis_filter_device_remove(dev);
+                return ret;
         }
 
         memcpy(device_info->mac_adr, rndis_device->hw_mac_adr, ETH_ALEN);