Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150855
b: refs/heads/master
c: ac28494
h: refs/heads/master
i:
  150853: 210801c
  150851: 98fe18d
  150847: 773e615
v: v3
  • Loading branch information
Marcel Holtmann committed Jun 8, 2009
1 parent b79353c commit 52cebc0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 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: b4324b5dc5b62ba76372e1bf8927230cf744df66
refs/heads/master: ac28494c51ad20c7ff9cb991eaeee359a500d88e
12 changes: 4 additions & 8 deletions trunk/drivers/bluetooth/hci_vhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h>

#define VERSION "1.2"
#define VERSION "1.3"

static int minor = MISC_DYNAMIC_MINOR;

Expand Down Expand Up @@ -342,16 +342,15 @@ static const struct file_operations vhci_fops = {
};

static struct miscdevice vhci_miscdev= {
.name = "vhci",
.fops = &vhci_fops,
.name = "vhci",
.fops = &vhci_fops,
.minor = MISC_DYNAMIC_MINOR,
};

static int __init vhci_init(void)
{
BT_INFO("Virtual HCI driver ver %s", VERSION);

vhci_miscdev.minor = minor;

if (misc_register(&vhci_miscdev) < 0) {
BT_ERR("Can't register misc device with minor %d", minor);
return -EIO;
Expand All @@ -369,9 +368,6 @@ static void __exit vhci_exit(void)
module_init(vhci_init);
module_exit(vhci_exit);

module_param(minor, int, 0444);
MODULE_PARM_DESC(minor, "Miscellaneous minor device number");

MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
MODULE_VERSION(VERSION);
Expand Down

0 comments on commit 52cebc0

Please sign in to comment.