From e630dcd308461464d6078f3833ce563961a94f79 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Tue, 10 Jan 2012 11:26:52 +0200 Subject: [PATCH] --- yaml --- r: 310329 b: refs/heads/master c: e23d83b0c92bbe30d1fe9d5c0b972e50c6593946 h: refs/heads/master i: 310327: fd9373d2940f009a7226a96d42013c881e5581f3 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dsi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aec1ec08aed0..5425774f061f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 958f2717b84e88bf833d996997fda8f73276f2af +refs/heads/master: e23d83b0c92bbe30d1fe9d5c0b972e50c6593946 diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c index 446e13667471..a243e65b870f 100644 --- a/trunk/drivers/video/omap2/dss/dsi.c +++ b/trunk/drivers/video/omap2/dss/dsi.c @@ -2306,7 +2306,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev) DSSDBGF(); - r = dsi->enable_pads(dsidev->id, dsi_get_lane_mask(dssdev)); + r = dsi->enable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev)); if (r) return r; @@ -2416,7 +2416,7 @@ static int dsi_cio_init(struct omap_dss_device *dssdev) dsi_cio_disable_lane_override(dsidev); err_scp_clk_dom: dsi_disable_scp_clk(dsidev); - dsi->disable_pads(dsidev->id, dsi_get_lane_mask(dssdev)); + dsi->disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev)); return r; } @@ -2430,7 +2430,7 @@ static void dsi_cio_uninit(struct omap_dss_device *dssdev) dsi_cio_power(dsidev, DSI_COMPLEXIO_POWER_OFF); dsi_disable_scp_clk(dsidev); - dsi->disable_pads(dsidev->id, dsi_get_lane_mask(dssdev)); + dsi->disable_pads(dsi_get_dsidev_id(dsidev), dsi_get_lane_mask(dssdev)); } static void dsi_config_tx_fifo(struct platform_device *dsidev,