Merge "msm: mdss: Fix memleak in panel_debug_reg_write" into LA.BR.1.3.6

This commit is contained in:
Linux Build Service Account 2016-08-09 01:40:28 -07:00 committed by Gerrit - the friendly Code Review server
commit e8def0fbb1
1 changed files with 4 additions and 2 deletions

View File

@ -199,6 +199,7 @@ static ssize_t panel_debug_base_reg_read(struct file *file,
struct mdss_panel_data *panel_data = ctl->panel_data;
struct mdss_dsi_ctrl_pdata *ctrl_pdata = container_of(panel_data,
struct mdss_dsi_ctrl_pdata, panel_data);
int rc = -EFAULT;
if (!dbg)
return -ENODEV;
@ -217,7 +218,8 @@ static ssize_t panel_debug_base_reg_read(struct file *file,
if (!rx_buf || !panel_reg_buf) {
pr_err("not enough memory to hold panel reg dump\n");
return -ENOMEM;
rc = -ENOMEM;
goto read_reg_fail;
}
if (mdata->debug_inf.debug_enable_clock)
@ -252,7 +254,7 @@ static ssize_t panel_debug_base_reg_read(struct file *file,
read_reg_fail:
kfree(rx_buf);
kfree(panel_reg_buf);
return -EFAULT;
return rc;
}
static const struct file_operations panel_off_fops = {