From 342208255f7ac554d74e6775f08e92b7303514f9 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sat, 7 Jan 2012 15:47:14 +0100 Subject: [PATCH] --- yaml --- r: 290856 b: refs/heads/master c: bf18c7118cf83ad4b9aa476354b4a06bcb9d0c4f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/bluetooth/hci_vhci.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ccb4069bbde9..f29a155f27c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aed014a02e809bd228a8ce7e7cc432ded9b72ef6 +refs/heads/master: bf18c7118cf83ad4b9aa476354b4a06bcb9d0c4f diff --git a/trunk/drivers/bluetooth/hci_vhci.c b/trunk/drivers/bluetooth/hci_vhci.c index 2ed6ab1c6e1b..44a801292d62 100644 --- a/trunk/drivers/bluetooth/hci_vhci.c +++ b/trunk/drivers/bluetooth/hci_vhci.c @@ -103,11 +103,6 @@ static int vhci_send_frame(struct sk_buff *skb) return 0; } -static void vhci_destruct(struct hci_dev *hdev) -{ - kfree(hdev->driver_data); -} - static inline ssize_t vhci_get_user(struct vhci_data *data, const char __user *buf, size_t count) { @@ -248,7 +243,6 @@ static int vhci_open(struct inode *inode, struct file *file) hdev->close = vhci_close_dev; hdev->flush = vhci_flush; hdev->send = vhci_send_frame; - hdev->destruct = vhci_destruct; hdev->owner = THIS_MODULE; @@ -273,6 +267,7 @@ static int vhci_release(struct inode *inode, struct file *file) hci_free_dev(hdev); file->private_data = NULL; + kfree(data); return 0; }