From 4375a9923e57f2917f1c9084b1a89aad426cd7ca Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2010 09:53:31 -0700 Subject: [PATCH] --- yaml --- r: 220435 b: refs/heads/master c: 1fb9dff04c97398c4c10a97037aa1c3505663153 h: refs/heads/master i: 220433: 67795fcc867b601d8100d961881ea872fb5fbff8 220431: d708aed27db11bbd9013f551b6c7ec340faea2be v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/netvsc.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 93d94f2afc7e..0629a3052d62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1382e0178eeb073594c90a80409e0923adc5048c +refs/heads/master: 1fb9dff04c97398c4c10a97037aa1c3505663153 diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c index be3825690a27..8b73144e7c12 100644 --- a/trunk/drivers/staging/hv/netvsc.c +++ b/trunk/drivers/staging/hv/netvsc.c @@ -738,7 +738,7 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) if (ret != 0) { DPRINT_ERR(NETVSC, "unable to connect to NetVSP - %d", ret); ret = -1; - goto Close; + goto close; } DPRINT_INFO(NETVSC, "*** NetVSC channel handshake result - %d ***", @@ -746,9 +746,9 @@ static int NetVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo) return ret; -Close: +close: /* Now, we can close the channel safely */ - Device->Driver->VmbusChannelInterface.Close(Device); + vmbus_close(Device->channel); Cleanup: @@ -810,7 +810,7 @@ static int NetVscOnDeviceRemove(struct hv_device *Device) DPRINT_INFO(NETVSC, "net device (%p) safe to remove", netDevice); /* Now, we can close the channel safely */ - Device->Driver->VmbusChannelInterface.Close(Device); + vmbus_close(Device->channel); /* Release all resources */ list_for_each_entry_safe(netvscPacket, pos,