Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150858
b: refs/heads/master
c: 092b858
h: refs/heads/master
v: v3
  • Loading branch information
Marcel Holtmann committed Jun 8, 2009
1 parent 001a842 commit 8729771
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 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: 3857abc622102b808de11ff3393d541b826ab952
refs/heads/master: 092b85853b161a5ca285c429faf1cf2ff4318a01
31 changes: 0 additions & 31 deletions trunk/drivers/bluetooth/hci_vhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,8 @@ struct vhci_data {

wait_queue_head_t read_wait;
struct sk_buff_head readq;

struct fasync_struct *fasync;
};

#define VHCI_FASYNC 0x0010

static struct miscdevice vhci_miscdev;

static int vhci_open_dev(struct hci_dev *hdev)
{
set_bit(HCI_RUNNING, &hdev->flags);
Expand Down Expand Up @@ -105,9 +99,6 @@ static int vhci_send_frame(struct sk_buff *skb)
memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
skb_queue_tail(&data->readq, skb);

if (data->flags & VHCI_FASYNC)
kill_fasync(&data->fasync, SIGIO, POLL_IN);

wake_up_interruptible(&data->read_wait);

return 0;
Expand Down Expand Up @@ -293,35 +284,13 @@ static int vhci_release(struct inode *inode, struct file *file)
return 0;
}

static int vhci_fasync(int fd, struct file *file, int on)
{
struct vhci_data *data = file->private_data;
int err = 0;

lock_kernel();
err = fasync_helper(fd, file, on, &data->fasync);
if (err < 0)
goto out;

if (on)
data->flags |= VHCI_FASYNC;
else
data->flags &= ~VHCI_FASYNC;

out:
unlock_kernel();
return err;
}

static const struct file_operations vhci_fops = {
.owner = THIS_MODULE,
.read = vhci_read,
.write = vhci_write,
.poll = vhci_poll,
.ioctl = vhci_ioctl,
.open = vhci_open,
.release = vhci_release,
.fasync = vhci_fasync,
};

static struct miscdevice vhci_miscdev= {
Expand Down

0 comments on commit 8729771

Please sign in to comment.