From patchwork Fri Feb 25 00:48:06 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Anca Emanuel <anca.emanuel@gmail.com>
X-Patchwork-Id: 588741
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1P0mAYT031277
	for <patchwork-linux-fbdev@patchwork.kernel.org>;
	Fri, 25 Feb 2011 00:48:11 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755479Ab1BYAsK (ORCPT
	<rfc822;patchwork-linux-fbdev@patchwork.kernel.org>);
	Thu, 24 Feb 2011 19:48:10 -0500
Received: from mail-wy0-f174.google.com ([74.125.82.174]:61277 "EHLO
	mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754995Ab1BYAsI convert rfc822-to-8bit (ORCPT
	<rfc822;linux-fbdev@vger.kernel.org>);
	Thu, 24 Feb 2011 19:48:08 -0500
Received: by wyg36 with SMTP id 36so1145685wyg.19
	for <multiple recipients>; Thu, 24 Feb 2011 16:48:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:in-reply-to:references:date
	:message-id:subject:from:to:cc:content-type
	:content-transfer-encoding;
	bh=pWNGVhBB0Cpsj2hK6HKIN4UYVUSeu5UtGArbqHd9AN8=;
	b=HFakCbThfc5tX1BmnGjrJ4FL3gSK/PO5qlVwPLE7AR3qZ2YXk7klE1U1lfq1rOfajz
	jV+AG4jLoniAoktjEBe+1JWajZJHZuaUw5Dryt9EAEsm/P9c5flHxfBuJwvWOl4qyNh6
	ryNNy+aodVyGFqognPci0HA/qpCjm212fNbwk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type:content-transfer-encoding;
	b=e6lEm0GXQXrpxEUnp6t1bgNyb8mPIorR+mJxvhmNj4Y9fqBJNjunxxeHAGLAx8XB33
	6ERHGh1/zZQrArFv1ndoJCoKcy7QoJhGyb4HvMmLHVTyoQ05GNGq4VroczyKRuyZuHJq
	mDraQnY54liFhwzyBLU1F1D+pFtbCOS0MViT4=
MIME-Version: 1.0
Received: by 10.227.157.76 with SMTP id a12mr1494646wbx.57.1298594886709;
	Thu, 24 Feb 2011 16:48:06 -0800 (PST)
Received: by 10.227.145.8 with HTTP; Thu, 24 Feb 2011 16:48:06 -0800 (PST)
In-Reply-To: <AANLkTinzse1ZfEvAuWfuZ_8VDypcnD5poU6GwOdYTgWh@mail.gmail.com>
References: <AANLkTi=TTZ57d1wUz1uH3R6igN8O77iDvSLMW=t86g9V@mail.gmail.com>
	<20110222140349.GA20708@kryptos.osrc.amd.com>
	<AANLkTikESHHfjBqoLFOno6qQz-NXEAo-wBY5JEeAW61N@mail.gmail.com>
	<AANLkTinh4pF7iaUGMcv_9gPy+VBD5POsTHbF_2zPJ17r@mail.gmail.com>
	<AANLkTi=Ys4mb4pc28cH4NMdtMgb2KewJbkXEGJmEP4J0@mail.gmail.com>
	<AANLkTinxHVDwSCouTaZEvR3yTJnSPAas9z6JauGDdS7=@mail.gmail.com>
	<AANLkTinD2cC9dGg2eBtZQhWvhSsuH2BcWDj8byLhWWso@mail.gmail.com>
	<AANLkTin8+F003-jFoQ0pd9OjN1oT2iqyNjd58SDJZuMK@mail.gmail.com>
	<AANLkTinzse1ZfEvAuWfuZ_8VDypcnD5poU6GwOdYTgWh@mail.gmail.com>
Date: Fri, 25 Feb 2011 02:48:06 +0200
Message-ID: <AANLkTi=wbtcAOmYE8UF7ynPZ_nR3ZXxVRBcuMVGNK4u0@mail.gmail.com>
Subject: Re: Linux 2.6.38-rc6
From: Anca Emanuel <anca.emanuel@gmail.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dave Airlie <airlied@redhat.com>, linux-fbdev@vger.kernel.org,
	Ben Skeggs <bskeggs@redhat.com>, dri-devel@lists.freedesktop.org,
	Borislav Petkov <bp@amd64.org>,
	Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Sender: linux-fbdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-fbdev.vger.kernel.org>
X-Mailing-List: linux-fbdev@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Fri, 25 Feb 2011 00:48:20 +0000 (UTC)


diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index e2bf953..e8f8925 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1511,6 +1511,7 @@ void remove_conflicting_framebuffers(struct
apertures_struct *a,
 			       "%s vs %s - removing generic driver\n",
 			       name, registered_fb[i]->fix.id);
 			unregister_framebuffer(registered_fb[i]);
+			registered_fb[i] = NULL;
 		}
 	}