drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
authorRoel Kluin <roel.kluin@gmail.com>
Thu, 31 Dec 2009 12:06:29 +0000 (13:06 +0100)
committerDave Airlie <airlied@redhat.com>
Thu, 7 Jan 2010 03:19:03 +0000 (13:19 +1000)
This always evaluates to true.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/drm_fb_helper.c

index 1b49fa055f4f39c2e8f363793a9feeea902ac105..100ee48760b7a0b320b8dd8f0047b848e8f006ce 100644 (file)
@@ -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