From owner-svn-src-head@FreeBSD.ORG Sun Feb 17 01:34:26 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1DD4B64B; Sun, 17 Feb 2013 01:34:26 +0000 (UTC) (envelope-from gonzo@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 EBCD32DF; Sun, 17 Feb 2013 01:34:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1H1YPkA019654; Sun, 17 Feb 2013 01:34:25 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1H1YPZJ019653; Sun, 17 Feb 2013 01:34:25 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201302170134.r1H1YPZJ019653@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Sun, 17 Feb 2013 01:34:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246891 - head/sys/dev/sdhci 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Feb 2013 01:34:26 -0000 Author: gonzo Date: Sun Feb 17 01:34:25 2013 New Revision: 246891 URL: http://svnweb.freebsd.org/changeset/base/246891 Log: Remove accidentally committed debug panic(9) call Modified: head/sys/dev/sdhci/sdhci.c Modified: head/sys/dev/sdhci/sdhci.c ============================================================================== --- head/sys/dev/sdhci/sdhci.c Sun Feb 17 00:51:34 2013 (r246890) +++ head/sys/dev/sdhci/sdhci.c Sun Feb 17 01:34:25 2013 (r246891) @@ -1090,12 +1090,8 @@ sdhci_data_irq(struct sdhci_slot *slot, } if (intmask & SDHCI_INT_DATA_TIMEOUT) slot->curcmd->error = MMC_ERR_TIMEOUT; - else if (intmask & (SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_END_BIT)) { - if (intmask & SDHCI_INT_DATA_CRC) { - panic("DATA CRC error\n"); - } + else if (intmask & (SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_END_BIT)) slot->curcmd->error = MMC_ERR_BADCRC; - } if (slot->curcmd->data == NULL && (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | SDHCI_INT_DMA_END))) {