From owner-svn-src-all@freebsd.org  Fri Jan 19 19:18:15 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9249FEC2E95;
 Fri, 19 Jan 2018 19:18:15 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 6DB7D70286;
 Fri, 19 Jan 2018 19:18:15 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A2018119E8;
 Fri, 19 Jan 2018 19:18:14 +0000 (UTC)
 (envelope-from scottl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0JJIEWR062132;
 Fri, 19 Jan 2018 19:18:14 GMT (envelope-from scottl@FreeBSD.org)
Received: (from scottl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0JJIEGt062131;
 Fri, 19 Jan 2018 19:18:14 GMT (envelope-from scottl@FreeBSD.org)
Message-Id: <201801191918.w0JJIEGt062131@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: scottl set sender to
 scottl@FreeBSD.org using -f
From: Scott Long <scottl@FreeBSD.org>
Date: Fri, 19 Jan 2018 19:18:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r328170 - head/sys/cam/mmc
X-SVN-Group: head
X-SVN-Commit-Author: scottl
X-SVN-Commit-Paths: head/sys/cam/mmc
X-SVN-Commit-Revision: 328170
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Jan 2018 19:18:15 -0000

Author: scottl
Date: Fri Jan 19 19:18:14 2018
New Revision: 328170
URL: https://svnweb.freebsd.org/changeset/base/328170

Log:
  Fix compile errors in r328165
  
  Reported by:	O. Hartmann
  Sponsored by:	Netflix

Modified:
  head/sys/cam/mmc/mmc_xpt.c

Modified: head/sys/cam/mmc/mmc_xpt.c
==============================================================================
--- head/sys/cam/mmc/mmc_xpt.c	Fri Jan 19 19:09:17 2018	(r328169)
+++ head/sys/cam/mmc/mmc_xpt.c	Fri Jan 19 19:18:14 2018	(r328170)
@@ -368,11 +368,9 @@ mmc_dev_advinfo(union ccb *start_ccb)
                 cdai->provsiz = 0;
                 break;
 	case CDAI_TYPE_MMC_PARAMS:
-		cdai->provsiz = device->mmc_ident_data;
-		if (device->mmc_ident_data == NULL)
-			break;
+		cdai->provsiz = sizeof(struct mmc_params);
 		amt = MIN(cdai->provsiz, cdai->bufsiz);
-		memcpy(cdai->buff, device->mmc_ident_data, amt);
+		memcpy(cdai->buf, &device->mmc_ident_data, amt);
 		break;
 	default:
                 panic("Unknown buftype");