Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268031
b: refs/heads/master
c: 0fb07a8
h: refs/heads/master
i:
  268029: a2416f2
  268027: 29eb27d
  268023: aab25e6
  268015: 600ade8
  267999: 54631a1
  267967: c186f90
  267903: d4f8b00
  267775: 715bb8c
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 29, 2011
1 parent de5975a commit 5af5175
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a504de3a1e201994eff1400d4eb16241be68c311
refs/heads/master: 0fb07a87ec663652bea02a54faa05fb4b3d0c20f
8 changes: 2 additions & 6 deletions trunk/drivers/staging/hv/storvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ static inline struct storvsc_device *alloc_stor_device(struct hv_device *device)
return stor_device;
}

static inline void free_stor_device(struct storvsc_device *device)
{
kfree(device);
}

/* Get the stordevice object iff exists and its refcount > 0 */
static inline struct storvsc_device *must_get_stor_device(
Expand Down Expand Up @@ -394,7 +390,7 @@ int storvsc_dev_add(struct hv_device *device,
/* Send it back up */
ret = storvsc_connect_to_vsp(device, device_info->ring_buffer_size);
if (ret) {
free_stor_device(stor_device);
kfree(stor_device);
return ret;
}
device_info->path_id = stor_device->path_id;
Expand Down Expand Up @@ -422,7 +418,7 @@ int storvsc_dev_remove(struct hv_device *device)
/* Close the channel */
vmbus_close(device->channel);

free_stor_device(stor_device);
kfree(stor_device);
return 0;
}

Expand Down

0 comments on commit 5af5175

Please sign in to comment.