diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2012-07-25 08:08:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-25 15:31:30 -0700 |
| commit | 5243e7bd98b2dfecef3acd82661b541905a86e7f (patch) | |
| tree | 0a8147f0620efd0b87c56ca0f403f96ac383a6a5 /drivers/net | |
| parent | fa85a6c29a493e8a574bf62a6349b38b591bf885 (diff) | |
| download | linux-3.10-5243e7bd98b2dfecef3acd82661b541905a86e7f.tar.gz linux-3.10-5243e7bd98b2dfecef3acd82661b541905a86e7f.tar.bz2 linux-3.10-5243e7bd98b2dfecef3acd82661b541905a86e7f.zip | |
hyperv: Add error handling to rndis_filter_device_add()
Reported-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/hyperv/rndis_filter.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c index fbf53946820..e5d6146937f 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); |