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

Commit a60565cb authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 600a9f7e 9719a635

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c

+2 −2
Original line number Diff line number Diff line 
/* 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);

drivers/media/platform/msm/camera_v2/jpeg_dma/msm_jpeg_dma_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -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);