Skip to content

Commit

Permalink
[media] s5p-mfc: Ensure that clock is disabled before turning power off
Browse files Browse the repository at this point in the history
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: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Marek Szyprowski authored and Mauro Carvalho Chehab committed Nov 30, 2016
1 parent 2e4e084 commit 8accb8f
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/media/platform/s5p-mfc/s5p_mfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -963,11 +963,13 @@ 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();
}
mfc_debug(2, "Shutting down clock\n");
s5p_mfc_clock_off();
}
if (dev)
dev->ctx[ctx->num] = NULL;
Expand Down

0 comments on commit 8accb8f

Please sign in to comment.