diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-12-31 13:06:29 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-01-07 13:19:03 +1000 |
| commit | e89a8c901ca94a47c0e0b2fb335623d810e37545 (patch) | |
| tree | 41f987ebe090a5f06a26346d3035258c91b4fbf6 | |
| parent | 8e10ee9a0da12c586d3397150e34a946507c23f3 (diff) | |
| download | linux-3.10-e89a8c901ca94a47c0e0b2fb335623d810e37545.tar.gz linux-3.10-e89a8c901ca94a47c0e0b2fb335623d810e37545.tar.bz2 linux-3.10-e89a8c901ca94a47c0e0b2fb335623d810e37545.zip | |
drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
This always evaluates to true.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 1b49fa055f4..100ee48760b 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -156,7 +156,7 @@ static bool drm_fb_helper_connector_parse_command_line(struct drm_connector *con force = DRM_FORCE_ON; break; case 'D': - if ((connector->connector_type != DRM_MODE_CONNECTOR_DVII) || + if ((connector->connector_type != DRM_MODE_CONNECTOR_DVII) && (connector->connector_type != DRM_MODE_CONNECTOR_HDMIB)) force = DRM_FORCE_ON; else |