diff options
| author | Siqi Lin <siqilin@google.com> | 2018-10-09 14:26:05 -0700 |
|---|---|---|
| committer | Siqi Lin <siqilin@google.com> | 2018-10-09 14:26:17 -0700 |
| commit | 4212e6b8dac5835bcf395e82f29987ff8975763c (patch) | |
| tree | 9f0fddb138d27d0407af12fefd5e918b5d859324 | |
| parent | 857a9c8f990c545645cada6e3a104855c70b6191 (diff) | |
| parent | ae2f29938c9e438d1dacd8b4e5e19696a9fc76d0 (diff) | |
Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-qpr1android-9.0.0_r0.41
December 2018.1
Bug: 117289242
Change-Id: I66167c8107907a090a544a0f9c325416b45e3ee0
Signed-off-by: Siqi Lin <siqilin@google.com>
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c | 3 | ||||
| -rw-r--r-- | drivers/platform/msm/sps/sps.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c index 437af72a6a55..76acbab8aefa 100644 --- a/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c +++ b/drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c @@ -32,6 +32,8 @@ #define MSM_JPEG_NAME "jpeg" #define DEV_NAME_LEN 10 +static char devname[DEV_NAME_LEN]; + static int msm_jpeg_open(struct inode *inode, struct file *filp) { int rc = 0; @@ -185,7 +187,6 @@ static int msm_jpeg_init_dev(struct platform_device *pdev) struct msm_jpeg_device *msm_jpeg_device_p; const struct of_device_id *device_id; const struct msm_jpeg_priv_data *priv_data; - char devname[DEV_NAME_LEN]; msm_jpeg_device_p = kzalloc(sizeof(struct msm_jpeg_device), GFP_ATOMIC); if (!msm_jpeg_device_p) { diff --git a/drivers/platform/msm/sps/sps.c b/drivers/platform/msm/sps/sps.c index 43754f6c3885..021542a6a5fb 100644 --- a/drivers/platform/msm/sps/sps.c +++ b/drivers/platform/msm/sps/sps.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2018, 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 @@ -1002,8 +1002,6 @@ static void sps_device_de_init(void) "sps:%s:BAMs are still registered", __func__); sps_map_de_init(); - - kfree(sps); } sps_mem_de_init(); @@ -2984,6 +2982,7 @@ static struct platform_driver msm_sps_driver = { .name = SPS_DRV_NAME, .owner = THIS_MODULE, .of_match_table = msm_sps_match, + .suppress_bind_attrs = true, }, .remove = msm_sps_remove, }; |