evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm : camera: Fix kw issues in Jpeg"

Browse source
This commit is contained in:
Linux Build Service Account 2017-03-21 13:28:49 -07:00 • committed by Gerrit - the friendly Code Review server
commit a60565cb32
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
/* Copyright (c) 2012-2017, 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
@ -261,7 +261,7 @@ static int msm_jpeg_init_dev(struct platform_device *pdev)
goto fail_4;
}
platform_set_drvdata(pdev, &msm_jpeg_device_p);
platform_set_drvdata(pdev, msm_jpeg_device_p);
JPEG_DBG("%s %s%d: success\n", __func__, MSM_JPEG_NAME, pdev->id);

2
drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c
View file

@ -1759,7 +1759,7 @@ void msm_jpegdma_hw_put(struct msm_jpegdma_device *dma)
*/
static int msm_jpegdma_hw_attach_iommu(struct msm_jpegdma_device *dma)
{
int ret;
int ret = -EINVAL;
mutex_lock(&dma->lock);