diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-25 22:39:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-25 22:39:45 -0800 |
| commit | c01debcd72ff37dbd87de54d5f0a1d753092775f (patch) | |
| tree | a14e17c2e368eaae70ce21d0d3c88d419b1183d4 /drivers/bluetooth/hci_vhci.c | |
| parent | d506d2b66af72403912db434453c5e5a31c0b2d3 (diff) | |
| parent | 651b6a34392167cd0310869cbc0341f91ba4d956 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'drivers/bluetooth/hci_vhci.c')
| -rw-r--r-- | drivers/bluetooth/hci_vhci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index 49a80c925123..3256192dcde8 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c @@ -308,12 +308,13 @@ static int hci_vhci_chr_open(struct inode *inode, struct file * file) static int hci_vhci_chr_close(struct inode *inode, struct file *file) { struct hci_vhci_struct *hci_vhci = (struct hci_vhci_struct *) file->private_data; + struct hci_dev *hdev = hci_vhci->hdev; - if (hci_unregister_dev(hci_vhci->hdev) < 0) { - BT_ERR("Can't unregister HCI device %s", hci_vhci->hdev->name); + if (hci_unregister_dev(hdev) < 0) { + BT_ERR("Can't unregister HCI device %s", hdev->name); } - hci_free_dev(hci_vhci->hdev); + hci_free_dev(hdev); file->private_data = NULL; return 0; |