2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 39eccf908a69..110552ff302c 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -49,7 +49,7 @@ struct intel_dp {
         uint32_t DP;
         uint8_t  link_configuration[DP_LINK_CONFIGURATION_SIZE];
         bool has_audio;
-        int force_audio;
+        enum hdmi_force_audio force_audio;
         uint32_t color_range;
         int dpms_mode;
         uint8_t link_bw;
@@ -2116,8 +2116,8 @@ intel_dp_detect(struct drm_connector *connector, bool force)
         if (status != connector_status_connected)
                 return status;
 
-        if (intel_dp->force_audio) {
-                intel_dp->has_audio = intel_dp->force_audio > 0;
+        if (intel_dp->force_audio != HDMI_AUDIO_AUTO) {
+                intel_dp->has_audio = (intel_dp->force_audio == HDMI_AUDIO_ON);
         } else {
                 edid = intel_dp_get_edid(connector, &intel_dp->adapter);
                 if (edid) {
@@ -2217,10 +2217,10 @@ intel_dp_set_property(struct drm_connector *connector,
 
                 intel_dp->force_audio = i;
 
-                if (i == 0)
+                if (i == HDMI_AUDIO_AUTO)
                         has_audio = intel_dp_detect_audio(connector);
                 else
-                        has_audio = i > 0;
+                        has_audio = (i == HDMI_AUDIO_ON);
 
                 if (has_audio == intel_dp->has_audio)
                         return 0;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 724190ec496b..e36b171c1e7d 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -148,7 +148,7 @@ struct intel_sdvo_connector {
         /* Mark the type of connector */
         uint16_t output_flag;
 
-        int force_audio;
+        enum hdmi_force_audio force_audio;
 
         /* This contains all current supported TV format */
         u8 tv_format_supported[TV_FORMAT_NUM];
@@ -1309,8 +1309,8 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
 
         if (status == connector_status_connected) {
                 struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
-                if (intel_sdvo_connector->force_audio)
-                        intel_sdvo->has_hdmi_audio = intel_sdvo_connector->force_audio > 0;
+                if (intel_sdvo_connector->force_audio != HDMI_AUDIO_AUTO)
+                        intel_sdvo->has_hdmi_audio = (intel_sdvo_connector->force_audio == HDMI_AUDIO_ON);
         }
 
         return status;
@@ -1683,10 +1683,10 @@ intel_sdvo_set_property(struct drm_connector *connector,
 
                 intel_sdvo_connector->force_audio = i;
 
-                if (i == 0)
+                if (i == HDMI_AUDIO_AUTO)
                         has_audio = intel_sdvo_detect_hdmi_audio(connector);
                 else
-                        has_audio = i > 0;
+                        has_audio = (i == HDMI_AUDIO_ON);
 
                 if (has_audio == intel_sdvo->has_hdmi_audio)
                         return 0;