From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Airlie <airlied@gmail.com>
Subject: Re: [RFC PATCH 1/2] drm: store connector name in connector struct
Date: Tue, 27 May 2014 16:01:55 +1000
Message-ID: <CAPM=9tx5ASc6vYttPZTNxm=cDuyRin8yi-+hGGsK-RtHJ=ZXbg@mail.gmail.com>
References: <cover.1400075481.git.jani.nikula@intel.com>
 <881f57fb7f6a7f5ad45e28afbe9d6b2d147c78c4.1400075481.git.jani.nikula@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces@lists.freedesktop.org>
Received: from mail-la0-f45.google.com (mail-la0-f45.google.com
 [209.85.215.45])
 by gabe.freedesktop.org (Postfix) with ESMTP id 37A016E601
 for <dri-devel@lists.freedesktop.org>; Mon, 26 May 2014 23:01:56 -0700 (PDT)
Received: by mail-la0-f45.google.com with SMTP id gl10so6193804lab.4
 for <dri-devel@lists.freedesktop.org>; Mon, 26 May 2014 23:01:55 -0700 (PDT)
In-Reply-To: <881f57fb7f6a7f5ad45e28afbe9d6b2d147c78c4.1400075481.git.jani.nikula@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/dri-devel>
List-Post: <mailto:dri-devel@lists.freedesktop.org>
List-Help: <mailto:dri-devel-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/dri-devel>,
 <mailto:dri-devel-request@lists.freedesktop.org?subject=subscribe>
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
To: Jani Nikula <jani.nikula@intel.com>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
List-Id: dri-devel@lists.freedesktop.org

> Reference: http://lkml.kernel.org/r/645ee6e22cad47d38a2b35c21c8d5fe3@DC1-MBX-01.ptsecurity.ru
> Signed-off-by: Jani Nikula <jani.nikula@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.