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

Commit 48dde407 authored by Jeff Hugo's avatar Jeff Hugo Committed by Stephen Boyd
Browse files

msm: bam_dmux: enable disconnect ack feature support by default 



The disconnect ack feature is normally turned on by a handshaking
mechanism between bam_dmux and A2, but on some 9615 variants that
mechanism will not exist.  A2 will still expect the disconnect ack to
be active and might crash if it encounters that it is not active.
Enable the disconnect ack feature by default to prevent this.

CRs-Fixed: 372958
Change-Id: I2222b4651e14c2154f51a8c38852a855cdd93c4e
Signed-off-by: default avatarJeffrey Hugo <jhugo@codeaurora.org>
parent 4a57ae3f

arch/arm/mach-msm/bam_dmux.c

+4 −4
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static struct completion dfab_unvote_completion; 
static DEFINE_SPINLOCK(wakelock_reference_lock);

static int wakelock_reference_count;

static int a2_pc_disabled_wakelock_skipped;

static int disconnect_ack;

static int disconnect_ack = 1;

static LIST_HEAD(bam_other_notify_funcs);

static DEFINE_MUTEX(smsm_cb_lock);

static DEFINE_MUTEX(delayed_ul_vote_lock);
@@ -561,9 +561,9 @@ static void handle_bam_mux_cmd(struct work_struct *work) 
		bam_dmux_log("%s: opening cid %d PC enabled\n", __func__,

				rx_hdr->ch_id);

		handle_bam_mux_cmd_open(rx_hdr);

		if (rx_hdr->reserved & ENABLE_DISCONNECT_ACK) {

			bam_dmux_log("%s: activating disconnect ack\n");

			disconnect_ack = 1;

		if (!(rx_hdr->reserved & ENABLE_DISCONNECT_ACK)) {

			bam_dmux_log("%s: deactivating disconnect ack\n");

			disconnect_ack = 0;

		}

		dev_kfree_skb_any(rx_skb);

		break;