[RFC PATCH 1/2] drm: store connector name in connector struct

Dave Airlie airlied at gmail.com
Mon May 26 23:01:55 PDT 2014


> Reference: http://lkml.kernel.org/r/645ee6e22cad47d38a2b35c21c8d5fe3@DC1-MBX-01.ptsecurity.ru
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>


> @@ -834,9 +824,17 @@ int drm_connector_init(struct drm_device *dev,
>                 ida_simple_get(connector_ida, 1, 0, GFP_KERNEL);
>         if (connector->connector_type_id < 0) {
>                 ret = connector->connector_type_id;
> -               drm_mode_object_put(dev, &connector->base);
> -               goto out;
> +               goto out_out;

^^ one of these things is not like the other,


>         }
> +       connector->name =
> +               kasprintf(GFP_KERNEL, "%s-%d",
> +                         drm_connector_enum_list[connector_type].name,
> +                         connector->connector_type_id);
> +       if (!connector->name) {
> +               ret = -ENOMEM;
> +               goto out_put;

^^,

I've merged this fixed into my tree, I'm sure Daniel won't mind :)

Dave.


More information about the dri-devel mailing list