diff mbox

[09/13] drm/i915: fix build in intel_display.c

Message ID 1361309508-4901-10-git-send-email-jbarnes@virtuousgeek.org (mailing list archive)
State New, archived
Headers show

Commit Message

Jesse Barnes Feb. 19, 2013, 9:31 p.m. UTC
Missing a curly brace.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/intel_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Imre Deak March 20, 2013, 12:41 p.m. UTC | #1
On Tue, 2013-02-19 at 13:31 -0800, Jesse Barnes wrote:
> Missing a curly brace.

Should be merged into 6/13.

> 
> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/intel_display.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0a2279e..595590c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9163,7 +9163,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev,
>  			if (crtc->mode_valid && encoder->get_mode_flags)
>  				crtc->base.mode.flags |= encoder->get_mode_flags(encoder);
>  			encoder->base.crtc = &crtc->base;
> -		} else
> +		} else {
>  			encoder->base.crtc = NULL;
>  		}
>
Jesse Barnes March 26, 2013, 11:26 p.m. UTC | #2
On Wed, 20 Mar 2013 14:41:32 +0200
Imre Deak <imre.deak@intel.com> wrote:

> On Tue, 2013-02-19 at 13:31 -0800, Jesse Barnes wrote:
> > Missing a curly brace.
> 
> Should be merged into 6/13.

Fixed.  Thanks.
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0a2279e..595590c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9163,7 +9163,7 @@  void intel_modeset_setup_hw_state(struct drm_device *dev,
 			if (crtc->mode_valid && encoder->get_mode_flags)
 				crtc->base.mode.flags |= encoder->get_mode_flags(encoder);
 			encoder->base.crtc = &crtc->base;
-		} else
+		} else {
 			encoder->base.crtc = NULL;
 		}