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

This project is archived. Its data is read-only.

Commit 5856d862 authored Oct 23, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Oct 23, 2014

Merge "msm: camera: Make wait functions in camera driver not interruptible"

parents cb0b4937 c4e6cc44

drivers/media/platform/msm/camera_v2/isp/msm_isp40.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -704,7 +704,7 @@ static long msm_vfe40_reset_hardware(struct vfe_device *vfe_dev,


		if (blocking_call) {
		rc = wait_for_completion_interruptible_timeout(
		rc = wait_for_completion_timeout(
		&vfe_dev->reset_complete, msecs_to_jiffies(50));
		}
		return rc;

drivers/media/platform/msm/camera_v2/isp/msm_isp44.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -562,7 +562,7 @@ static long msm_vfe44_reset_hardware(struct vfe_device *vfe_dev,
		}

		if (blocking_call) {
		rc = wait_for_completion_interruptible_timeout(
		rc = wait_for_completion_timeout(
		&vfe_dev->reset_complete, msecs_to_jiffies(50));
		if (rc <= 0) {
		pr_err("%s:%d failed: reset timeout\n", __func__,
		@@ -1282,7 +1282,7 @@ static int msm_vfe44_axi_halt(struct vfe_device *vfe_dev,
		init_completion(&vfe_dev->halt_complete);
		/* Halt AXI Bus Bridge */
		msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x2C0);
		rc = wait_for_completion_interruptible_timeout(
		rc = wait_for_completion_timeout(
		&vfe_dev->halt_complete, msecs_to_jiffies(500));
		} else {
		/* Halt AXI Bus Bridge */

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ static long msm_vfe46_reset_hardware(struct vfe_device *vfe_dev,
		}

		if (blocking_call) {
		rc = wait_for_completion_interruptible_timeout(
		rc = wait_for_completion_timeout(
		&vfe_dev->reset_complete, msecs_to_jiffies(50));
		if (rc <= 0) {
		pr_err("%s:%d failed: reset timeout\n", __func__,
		@@ -1256,7 +1256,7 @@ static int msm_vfe46_axi_halt(struct vfe_device *vfe_dev,
		init_completion(&vfe_dev->halt_complete);
		/* Halt AXI Bus Bridge */
		msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x374);
		rc = wait_for_completion_interruptible_timeout(
		rc = wait_for_completion_timeout(
		&vfe_dev->halt_complete, msecs_to_jiffies(500));
		} else {
		/* Halt AXI Bus Bridge */

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -509,7 +509,7 @@ static long msm_vfe47_reset_hardware(struct vfe_device *vfe_dev,
		}

		if (blocking_call) {
		rc = wait_for_completion_interruptible_timeout(
		rc = wait_for_completion_timeout(
		&vfe_dev->reset_complete, msecs_to_jiffies(50));
		if (rc <= 0) {
		pr_err("%s:%d failed: reset timeout\n", __func__,
		@@ -1248,7 +1248,7 @@ static int msm_vfe47_axi_halt(struct vfe_device *vfe_dev,
		init_completion(&vfe_dev->halt_complete);
		/* Halt AXI Bus Bridge */
		msm_camera_io_w_mb(0x1, vfe_dev->vfe_base + 0x374);
		rc = wait_for_completion_interruptible_timeout(
		rc = wait_for_completion_timeout(
		&vfe_dev->halt_complete, msecs_to_jiffies(500));
		} else {
		/* Halt AXI Bus Bridge */

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -838,7 +838,7 @@ static int msm_ispif_restart_frame_boundary(struct ispif_device *ispif,
		}

		if (vfe_mask & (1 << VFE0)) {
		timeout = wait_for_completion_interruptible_timeout(
		timeout = wait_for_completion_timeout(
		&ispif->reset_complete[VFE0], msecs_to_jiffies(500));
		if (timeout <= 0) {
		pr_err("%s: VFE0 reset wait timeout\n", __func__);
		@@ -848,7 +848,7 @@ static int msm_ispif_restart_frame_boundary(struct ispif_device *ispif,
		}

		if (ispif->hw_num_isps > 1 && (vfe_mask & (1 << VFE1))) {
		timeout = wait_for_completion_interruptible_timeout(
		timeout = wait_for_completion_timeout(
		&ispif->reset_complete[VFE1],
		msecs_to_jiffies(500));
		if (timeout <= 0) {