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

Commit 8accb8fd authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Ensure that clock is disabled before turning power off 



Move clock disabling before turning power off.  This will enable later
to add calls to clk_prepare/unprepare in the s5p_mfc_power_off() function
to avoid keeping clocks prepared all the time when driver is bound.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 2e4e0844

drivers/media/platform/s5p-mfc/s5p_mfc.c

+4 −2
Original line number Diff line number Diff line
@@ -963,12 +963,14 @@ static int s5p_mfc_release(struct file *file) 
			mfc_debug(2, "Last instance\n");

			s5p_mfc_deinit_hw(dev);

			del_timer_sync(&dev->watchdog_timer);

			s5p_mfc_clock_off();

			if (s5p_mfc_power_off() < 0)

				mfc_err("Power off failed\n");

		}

		} else {

			mfc_debug(2, "Shutting down clock\n");

			s5p_mfc_clock_off();

		}

	}

	if (dev)

		dev->ctx[ctx->num] = NULL;

	s5p_mfc_dec_ctrls_delete(ctx);