Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c59191e2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: msm_glink_pkt: remove the wakeup source during device close"

parents 193d7f5c 92f65af6
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -984,6 +984,7 @@ int glink_pkt_release(struct inode *inode, struct file *file)
{
	int ret = 0;
	struct glink_pkt_dev *devp = file->private_data;
	unsigned long flags;
	GLINK_PKT_INFO("%s() on dev id:%d by [%s] ref_cnt[%d]\n",
			__func__, devp->i, current->comm, devp->ref_cnt);

@@ -1011,7 +1012,12 @@ int glink_pkt_release(struct inode *inode, struct file *file)
			mutex_lock(&devp->ch_lock);
		}
		devp->poll_mode = 0;
		spin_lock_irqsave(&devp->pa_spinlock, flags);
		if (devp->ws_locked) {
			__pm_relax(&devp->pa_ws);
			devp->ws_locked = 0;
		}
		spin_unlock_irqrestore(&devp->pa_spinlock, flags);
		devp->sigs_updated = false;
		devp->in_reset = 0;
	}