aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/imx-drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-06-04 15:47:41 +1000
committerDave Airlie <airlied@redhat.com>2014-06-04 15:47:41 +1000
commit885ae1c55ae46ee1064bc7cb99dc45ddd8bd0328 (patch)
treeda636f922476a4eeb55066588d9857465f7718f3 /drivers/staging/imx-drm
parentb33a51e457b7e01e3e25eaa7c99aec32e65c00de (diff)
parent46340642d7c314e4d718ebcdbb00bd55ed7d9d9f (diff)
downloadlinux-stericsson-885ae1c55ae46ee1064bc7cb99dc45ddd8bd0328.tar.gz
Merge tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel into drm-next
Just flushing out my pile of random drm patches for the merge window, nothing big. And it all hung around in drm-intel trees for a while (only just rebased now). * tag 'topic/core-stuff-2014-06-02' of git://anongit.freedesktop.org/drm-intel: imx-drm: imx-tve: remove unused variable drm: Missed clflushopt in drm_clflush_virt_range drm/plane: Fix a couple of checkpatch warnings drm/plane: Fix sparse warnings drm/exynos: Fix double locks at PM resume drm/ast: Fix double lock at PM resume drm/dp-helper: Deprecate old i2c-over-dp_aux heleprs
Diffstat (limited to 'drivers/staging/imx-drm')
-rw-r--r--drivers/staging/imx-drm/imx-tve.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/imx-tve.c b/drivers/staging/imx-drm/imx-tve.c
index 5a5a5287a86a..af8af4d1c988 100644
--- a/drivers/staging/imx-drm/imx-tve.c
+++ b/drivers/staging/imx-drm/imx-tve.c
@@ -249,7 +249,6 @@ static int imx_tve_connector_mode_valid(struct drm_connector *connector,
{
struct imx_tve *tve = con_to_tve(connector);
unsigned long rate;
- int ret;
/* pixel clock with 2x oversampling */
rate = clk_round_rate(tve->clk, 2000UL * mode->clock) / 2000;