From mboxrd@z Thu Jan  1 00:00:00 1970
From: Chris Wilson <chris@chris-wilson.co.uk>
Subject: Re: [PATCH 1/3] drm: Cleanup after failing to create master->unique
	and dev->name
Date: Sat, 24 Jul 2010 18:56:39 +0100
Message-ID: <89kc63$hi26p3@fmsmga002.fm.intel.com>
References: <1279992577-31841-1-git-send-email-chris@chris-wilson.co.uk>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
	by gabe.freedesktop.org (Postfix) with ESMTP id 328FA9E774
	for <dri-devel@lists.freedesktop.org>;
	Sat, 24 Jul 2010 10:56:41 -0700 (PDT)
In-Reply-To: <1279992577-31841-1-git-send-email-chris@chris-wilson.co.uk>
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>
Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org
To: dri-devel@lists.freedesktop.org
List-Id: dri-devel@lists.freedesktop.org

On Sat, 24 Jul 2010 18:29:35 +0100, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> @@ -323,7 +358,9 @@ int drm_setversion(struct drm_device *dev, void *data, struct drm_file *file_pri
>  			/*
>  			 * Version 1.1 includes tying of DRM to specific device
>  			 */
> -			drm_set_busid(dev, file_priv);
> +			retcode = drm_set_busid(dev, file_priv);
> +			if (retcode)
> +				goto done;

And actually returning the error code is breaking xorg 1.8.99...
Hmm.

-- 
Chris Wilson, Intel Open Source Technology Centre