diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2017-06-01 14:24:24 -0400 |
| commit | e3db1289e7432a882823a7effc474aff78868489 (patch) | |
| tree | 79188812b29602fe3b3641d55c32cfdc2101f0ef /drivers/net/xen-netfront.c | |
| parent | c316cf670491def52a396d3bdc5a63ad01f7fefa (diff) | |
| parent | 05e97a9eda72d58dba293857df6aac62584ef99a (diff) | |
Merge MTD fixes into -next
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 6ffc482550c1..7b61adb6270c 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -1934,8 +1934,7 @@ abort_transaction_no_dev_fatal: | |||
| 1934 | xennet_disconnect_backend(info); | 1934 | xennet_disconnect_backend(info); |
| 1935 | xennet_destroy_queues(info); | 1935 | xennet_destroy_queues(info); |
| 1936 | out: | 1936 | out: |
| 1937 | unregister_netdev(info->netdev); | 1937 | device_unregister(&dev->dev); |
| 1938 | xennet_free_netdev(info->netdev); | ||
| 1939 | return err; | 1938 | return err; |
| 1940 | } | 1939 | } |
| 1941 | 1940 | ||