Merge "msm: vidc: Use readl_poll_timeout() correctly" (203a92e7) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/vidc/venus_hfi.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1035,8 +1035,7 @@ static int venus_hfi_halt_axi(struct venus_hfi_device *device)
		venus_hfi_write_register(device, VENUS_VBIF_AXI_HALT_CTRL0, reg, 0);

		/* Request for AXI bus port halt */
		rc = readl_poll_timeout(
		(unsigned long)device->hal_data->register_base_addr
		rc = readl_poll_timeout(device->hal_data->register_base_addr
		+ VENUS_VBIF_AXI_HALT_CTRL1,
		reg, reg & VENUS_VBIF_AXI_HALT_CTRL1_HALT_ACK,
		POLL_INTERVAL_US,