From 45365a20365c57bb51655d30cd326717ea6464ec Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Wed, 14 Nov 2012 19:32:17 +0900 Subject: [PATCH] --- yaml --- r: 337963 b: refs/heads/master c: ddcd49ed6e74f98a643532ec4ccac8841099785c h: refs/heads/master i: 337961: f8b874d9626bd80a758fb973e2b3ef97c35657f6 337959: 8f9e35944aa1a6757f5be8bb325752d1de63d883 v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_fb.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 27f414819675..668d55573a5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 582bc28c2d1c0fe45ba797c48b46a8dda537c4b4 +refs/heads/master: ddcd49ed6e74f98a643532ec4ccac8841099785c diff --git a/trunk/drivers/staging/omapdrm/omap_fb.c b/trunk/drivers/staging/omapdrm/omap_fb.c index 75d2ff1bf8ad..09028e9c1093 100644 --- a/trunk/drivers/staging/omapdrm/omap_fb.c +++ b/trunk/drivers/staging/omapdrm/omap_fb.c @@ -307,17 +307,16 @@ struct drm_connector *omap_framebuffer_get_next_connector( struct list_head *connector_list = &dev->mode_config.connector_list; struct drm_connector *connector = from; - if (!from) { + if (!from) return list_first_entry(connector_list, typeof(*from), head); - } list_for_each_entry_from(connector, connector_list, head) { if (connector != from) { struct drm_encoder *encoder = connector->encoder; struct drm_crtc *crtc = encoder ? encoder->crtc : NULL; - if (crtc && crtc->fb == fb) { + if (crtc && crtc->fb == fb) return connector; - } + } } @@ -466,8 +465,8 @@ struct drm_framebuffer *omap_framebuffer_init(struct drm_device *dev, return fb; fail: - if (fb) { + if (fb) omap_framebuffer_destroy(fb); - } + return ERR_PTR(ret); }