diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-01-07 13:32:44 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-01-09 13:24:01 +0100 |
| commit | e6f686ef0b4668caa6d60e02cce650d99c571a4d (patch) | |
| tree | d35d0fb8daeabb2d9cf6f3c95b682a505a854331 | |
| parent | 2d9eefa67b15a3a6fbee37d4c31282ecad216569 (diff) | |
tegra: video: use correct return value for callback
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/dc.h | 2 | ||||
| -rw-r--r-- | drivers/video/tegra/dc/ext/dev.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/include/mach/dc.h b/arch/arm/mach-tegra/include/mach/dc.h index a86af24fb7ee..abab990aab23 100644 --- a/arch/arm/mach-tegra/include/mach/dc.h +++ b/arch/arm/mach-tegra/include/mach/dc.h @@ -598,7 +598,7 @@ struct tegra_dc_edid { struct tegra_dc_edid *tegra_dc_get_edid(struct tegra_dc *dc); void tegra_dc_put_edid(struct tegra_dc_edid *edid); -int tegra_dc_set_flip_callback(void (*callback)(void)); +int tegra_dc_set_flip_callback(int (*callback)(void)); int tegra_dc_unset_flip_callback(void); int tegra_dc_get_panel_sync_rate(void); diff --git a/drivers/video/tegra/dc/ext/dev.c b/drivers/video/tegra/dc/ext/dev.c index c8104deb5ed6..37a6d9bd3f80 100644 --- a/drivers/video/tegra/dc/ext/dev.c +++ b/drivers/video/tegra/dc/ext/dev.c @@ -296,7 +296,7 @@ static int tegra_dc_ext_set_windowattr(struct tegra_dc_ext *ext, #endif /* !CONFIG_ANDROID */ } -static void (*flip_callback)(void); +static int (*flip_callback)(void); static spinlock_t flip_callback_lock; static bool init_tegra_dc_flip_callback_called; @@ -309,7 +309,7 @@ static int __init init_tegra_dc_flip_callback(void) pure_initcall(init_tegra_dc_flip_callback); -int tegra_dc_set_flip_callback(void (*callback)(void)) +int tegra_dc_set_flip_callback(int (*callback)(void)) { WARN_ON(!init_tegra_dc_flip_callback_called); |