From fd2ce9474b9e4bbf88e3d9e947faae766585ec44 Mon Sep 17 00:00:00 2001 From: awhite6 Date: Thu, 12 Dec 2019 14:50:07 -0600 Subject: [PATCH] drivers: aw8697: fix kernel panic on RTP There was mixing of memory allocation methods, i.e. allocating with vzalloc() and trying to free with kfree() Change-Id: I8ae2627c1bb6431b44311bca093c671df162e91d Signed-off-by: awhite6 Reviewed-on: https://gerrit.mot.com/1471259 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Konstantin Makariev Submit-Approved: Jira Key --- drivers/misc/awinic/aw8697/aw8697.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/misc/awinic/aw8697/aw8697.c b/drivers/misc/awinic/aw8697/aw8697.c index 22cc9ca4ef8b..7e37a7d5e5ee 100644 --- a/drivers/misc/awinic/aw8697/aw8697.c +++ b/drivers/misc/awinic/aw8697/aw8697.c @@ -452,6 +452,7 @@ static int aw8697_haptic_play_mode(struct aw8697 *aw8697, unsigned char play_mode) { pr_debug("%s enter\n", __func__); + pr_debug("%s: play_mode=%d\n", __func__, play_mode); switch (play_mode) { case AW8697_HAPTIC_STANDBY_MODE: @@ -1579,8 +1580,8 @@ static void aw8697_rtp_work_routine(struct work_struct *work) return; } aw8697->rtp_init = 0; - kfree(aw8697_rtp); - aw8697_rtp = kzalloc(rtp_file->size+sizeof(int), GFP_KERNEL); + vfree(aw8697_rtp); + aw8697_rtp = vzalloc(rtp_file->size+sizeof(int)); if (!aw8697_rtp) { release_firmware(rtp_file); pr_err("%s: error allocating memory\n", __func__); @@ -2620,6 +2621,8 @@ static ssize_t aw8697_duration_store(struct device *dev, if (val <= 0) return count; + pr_debug("%s: duration=%d\n", __func__, val); + aw8697->duration = val; return count; @@ -2888,6 +2891,7 @@ static ssize_t aw8697_seq_store(struct device *dev, mutex_lock(&aw8697->lock); for (i = 0; i < AW8697_WAV_SEQ_SIZE; i++) { aw8697->seq[i] = (val >> ((AW8697_WAV_SEQ_SIZE-i-1) * 8)) & 0xFF; + pr_debug("%s: seq[%d]=%d\n", __func__, i, aw8697->seq[i]); aw8697_haptic_set_wav_seq(aw8697, i, aw8697->seq[i]); } mutex_unlock(&aw8697->lock);