| Message ID | 1455540316-17066-2-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 15, 2016 at 01:45:16PM +0100, Maarten Lankhorst wrote: > add_all_connectors doesn't checks whether reallocation is needed, but add_one does. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Both applied to drm-misc, thanks. -Daniel > --- > drivers/gpu/drm/drm_fb_helper.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 0893b82ce588..855108e6e1bd 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -104,21 +104,17 @@ int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper) > { > struct drm_device *dev = fb_helper->dev; > struct drm_connector *connector; > - int i; > + int i, ret; > > if (!drm_fbdev_emulation) > return 0; > > mutex_lock(&dev->mode_config.mutex); > drm_for_each_connector(connector, dev) { > - struct drm_fb_helper_connector *fb_helper_connector; > + ret = drm_fb_helper_add_one_connector(fb_helper, connector); > > - fb_helper_connector = kzalloc(sizeof(struct drm_fb_helper_connector), GFP_KERNEL); > - if (!fb_helper_connector) > + if (ret) > goto fail; > - > - fb_helper_connector->connector = connector; > - fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector; > } > mutex_unlock(&dev->mode_config.mutex); > return 0; > @@ -130,7 +126,7 @@ fail: > fb_helper->connector_count = 0; > mutex_unlock(&dev->mode_config.mutex); > > - return -ENOMEM; > + return ret; > } > EXPORT_SYMBOL(drm_fb_helper_single_add_all_connectors); > > -- > 2.1.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 0893b82ce588..855108e6e1bd 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -104,21 +104,17 @@ int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper) { struct drm_device *dev = fb_helper->dev; struct drm_connector *connector; - int i; + int i, ret; if (!drm_fbdev_emulation) return 0; mutex_lock(&dev->mode_config.mutex); drm_for_each_connector(connector, dev) { - struct drm_fb_helper_connector *fb_helper_connector; + ret = drm_fb_helper_add_one_connector(fb_helper, connector); - fb_helper_connector = kzalloc(sizeof(struct drm_fb_helper_connector), GFP_KERNEL); - if (!fb_helper_connector) + if (ret) goto fail; - - fb_helper_connector->connector = connector; - fb_helper->connector_info[fb_helper->connector_count++] = fb_helper_connector; } mutex_unlock(&dev->mode_config.mutex); return 0; @@ -130,7 +126,7 @@ fail: fb_helper->connector_count = 0; mutex_unlock(&dev->mode_config.mutex); - return -ENOMEM; + return ret; } EXPORT_SYMBOL(drm_fb_helper_single_add_all_connectors);
add_all_connectors doesn't checks whether reallocation is needed, but add_one does. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/drm_fb_helper.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)