From owner-svn-src-stable-7@FreeBSD.ORG  Tue Jun 23 15:50:48 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC79B106564A;
	Tue, 23 Jun 2009 15:50:48 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 99C0A8FC16;
	Tue, 23 Jun 2009 15:50:48 +0000 (UTC)
	(envelope-from rnoland@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5NFomXM081284;
	Tue, 23 Jun 2009 15:50:48 GMT (envelope-from rnoland@svn.freebsd.org)
Received: (from rnoland@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5NFom1u081282;
	Tue, 23 Jun 2009 15:50:48 GMT (envelope-from rnoland@svn.freebsd.org)
Message-Id: <200906231550.n5NFom1u081282@svn.freebsd.org>
From: Robert Noland <rnoland@FreeBSD.org>
Date: Tue, 23 Jun 2009 15:50:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194722 - in stable/7/sys: . contrib/pf dev/drm
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jun 2009 15:50:49 -0000

Author: rnoland
Date: Tue Jun 23 15:50:48 2009
New Revision: 194722
URL: http://svn.freebsd.org/changeset/base/194722

Log:
  Merge 190163 from HEAD
  
  Don't deref dev->dev_private before checking that it exists.
  
  Found with:     Coverity Prevent(tm)
  CID:            2940

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/drm/i915_drv.c

Modified: stable/7/sys/dev/drm/i915_drv.c
==============================================================================
--- stable/7/sys/dev/drm/i915_drv.c	Tue Jun 23 15:49:02 2009	(r194721)
+++ stable/7/sys/dev/drm/i915_drv.c	Tue Jun 23 15:50:48 2009	(r194722)
@@ -46,9 +46,8 @@ static drm_pci_id_list_t i915_pciidlist[
 static int i915_suspend(device_t kdev)
 {
 	struct drm_device *dev = device_get_softc(kdev);
-	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	if (!dev || !dev_priv) {
+	if (!dev || !dev->dev_private) {
 		DRM_ERROR("dev: 0x%lx, dev_priv: 0x%lx\n",
 			(unsigned long) dev, (unsigned long) dev_priv);
 		DRM_ERROR("DRM not initialized, aborting suspend.\n");