From owner-svn-src-head@FreeBSD.ORG  Thu Apr  4 09:15:20 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 72051C0;
 Thu,  4 Apr 2013 09:15:20 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6353ACD;
 Thu,  4 Apr 2013 09:15:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r349FKLb091829;
 Thu, 4 Apr 2013 09:15:20 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r349FKkY091828;
 Thu, 4 Apr 2013 09:15:20 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201304040915.r349FKkY091828@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 4 Apr 2013 09:15:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249089 - head/sys/dev/ahci
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Apr 2013 09:15:20 -0000

Author: mav
Date: Thu Apr  4 09:15:19 2013
New Revision: 249089
URL: http://svnweb.freebsd.org/changeset/base/249089

Log:
  Check status of ahci_em_reset() on attach and abort if reset failed.
  For now it is just a hypothetical case.
  
  Submitted by:	Dmitry Luhtionov <dmitryluhtionov@gmail.com>

Modified:
  head/sys/dev/ahci/ahciem.c

Modified: head/sys/dev/ahci/ahciem.c
==============================================================================
--- head/sys/dev/ahci/ahciem.c	Thu Apr  4 08:57:29 2013	(r249088)
+++ head/sys/dev/ahci/ahciem.c	Thu Apr  4 09:15:19 2013	(r249089)
@@ -104,7 +104,10 @@ ahci_em_attach(device_t dev)
 	} else
 		enc->r_memr = NULL;
 	mtx_lock(&enc->mtx);
-	ahci_em_reset(dev);
+	if (ahci_em_reset(dev) != 0) {
+	    error = ENXIO;
+	    goto err1;
+	}
 	rid = ATA_IRQ_RID;
 	/* Create the device queue for our SIM. */
 	devq = cam_simq_alloc(1);