diff options
| author |   Philipp Zabel <p.zabel@pengutronix.de> | 2014-04-07 10:22:36 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-25 16:13:56 -0700 |
| commit | 60d857bffcac67c77a33c06d8dfe405f3a293d2b (patch) | |
| tree | 26c3244ced133010d39996c40810034c146e027b /drivers/staging/imx-drm | |
| parent | imx-hdmi: Propagate the real error code on platform_get_irq() failure (diff) | |
| download | linux-dev-60d857bffcac67c77a33c06d8dfe405f3a293d2b.tar.xz linux-dev-60d857bffcac67c77a33c06d8dfe405f3a293d2b.zip | |
imx-drm: imx-drm-core: Fix imx_drm_encoder_get_mux_id
The decoder mux id is equal to the port id of the encoder's input port
that is connected to the given crtc, not to the endpoint id (which is
arbitrary and usually zero).
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm')
| -rw-r--r-- | drivers/staging/imx-drm/imx-drm-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/imx-drm/imx-drm-core.c b/drivers/staging/imx-drm/imx-drm-core.c index 4144a75e5f71..bc7f8bd227c7 100644 --- a/drivers/staging/imx-drm/imx-drm-core.c +++ b/drivers/staging/imx-drm/imx-drm-core.c @@ -517,7 +517,7 @@ int imx_drm_encoder_get_mux_id(struct device_node *node, of_node_put(port); if (port == imx_crtc->port) { ret = of_graph_parse_endpoint(ep, &endpoint); - return ret ? ret : endpoint.id; + return ret ? ret : endpoint.port; } } while (ep); |