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

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

Merge "char: msm_smd_pkt: Avoid unloading modem in smd_pkt_open"

parents 2e5fdb99 ab401980

drivers/char/msm_smd_pkt.c

+6 −2
Original line number Diff line number Diff line
@@ -1010,8 +1010,10 @@ int smd_pkt_open(struct inode *inode, struct file *file) 
				smd_pkt_devp->ch_opened_wait_queue,

				smd_pkt_devp->is_open,

				msecs_to_jiffies(open_wait_rem));

		if (r == 0) {

		if (r == 0)

			r = -ETIMEDOUT;



		if (r < 0) {

			/* close the ch to sync smd's state with smd_pkt */

			smd_close(smd_pkt_devp->ch);

			smd_pkt_devp->ch = NULL;
@@ -1040,8 +1042,10 @@ int smd_pkt_open(struct inode *inode, struct file *file) 
		smd_pkt_devp->ref_cnt++;

	}

release_pil:

	if (peripheral && (r < 0))

	if (peripheral && (r < 0)) {

		subsystem_put(smd_pkt_devp->pil);

		smd_pkt_devp->pil = NULL;

	}



release_pd:

	if (r < 0)