From owner-svn-src-all@FreeBSD.ORG  Thu Jun 23 15:10:44 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E5F88106566C;
	Thu, 23 Jun 2011 15:10:44 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id D635A8FC17;
	Thu, 23 Jun 2011 15:10:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5NFAiP5004457;
	Thu, 23 Jun 2011 15:10:44 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5NFAixO004455;
	Thu, 23 Jun 2011 15:10:44 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201106231510.p5NFAixO004455@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 23 Jun 2011 15:10:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223475 - head/sys/cam/ata
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2011 15:10:45 -0000

Author: mav
Date: Thu Jun 23 15:10:44 2011
New Revision: 223475
URL: http://svn.freebsd.org/changeset/base/223475

Log:
  Fix ATAPI breakage introduced by r223443. It made SCSI commands to ATAPI
  device to never complete, that caused probe process (system boot) stuck.

Modified:
  head/sys/cam/ata/ata_xpt.c

Modified: head/sys/cam/ata/ata_xpt.c
==============================================================================
--- head/sys/cam/ata/ata_xpt.c	Thu Jun 23 12:11:43 2011	(r223474)
+++ head/sys/cam/ata/ata_xpt.c	Thu Jun 23 15:10:44 2011	(r223475)
@@ -1678,7 +1678,8 @@ ata_action(union ccb *start_ccb)
 			xpt_done(start_ccb);
 			break;
 		}
-		/* FALLTHROUGH */
+		xpt_action_default(start_ccb);
+		break;
 	}
 	case XPT_DEV_ADVINFO:
 	{