Skip to content

Commit

Permalink
Bluetooth: hci_vhci: Fix calling hci_{suspend,resume}_dev
Browse files Browse the repository at this point in the history
Defer calls to hci_{suspend,resume}_dev to work so it doesn't block the
processing of the events.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Vudentz authored and holtmann committed Oct 6, 2021
1 parent d0f1c24 commit d16e6d1
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions drivers/bluetooth/hci_vhci.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ struct vhci_data {

struct mutex open_mutex;
struct delayed_work open_timeout;
struct work_struct suspend_work;

bool suspended;
bool wakeup;
Expand Down Expand Up @@ -114,6 +115,17 @@ static ssize_t force_suspend_read(struct file *file, char __user *user_buf,
return simple_read_from_buffer(user_buf, count, ppos, buf, 2);
}

static void vhci_suspend_work(struct work_struct *work)
{
struct vhci_data *data = container_of(work, struct vhci_data,
suspend_work);

if (data->suspended)
hci_suspend_dev(data->hdev);
else
hci_resume_dev(data->hdev);
}

static ssize_t force_suspend_write(struct file *file,
const char __user *user_buf,
size_t count, loff_t *ppos)
Expand All @@ -129,16 +141,10 @@ static ssize_t force_suspend_write(struct file *file,
if (data->suspended == enable)
return -EALREADY;

if (enable)
err = hci_suspend_dev(data->hdev);
else
err = hci_resume_dev(data->hdev);

if (err)
return err;

data->suspended = enable;

schedule_work(&data->suspend_work);

return count;
}

Expand Down Expand Up @@ -440,6 +446,7 @@ static int vhci_open(struct inode *inode, struct file *file)

mutex_init(&data->open_mutex);
INIT_DELAYED_WORK(&data->open_timeout, vhci_open_timeout);
INIT_WORK(&data->suspend_work, vhci_suspend_work);

file->private_data = data;
nonseekable_open(inode, file);
Expand All @@ -455,6 +462,7 @@ static int vhci_release(struct inode *inode, struct file *file)
struct hci_dev *hdev;

cancel_delayed_work_sync(&data->open_timeout);
flush_work(&data->suspend_work);

hdev = data->hdev;

Expand Down

0 comments on commit d16e6d1

Please sign in to comment.