From owner-svn-soc-all@FreeBSD.ORG  Sat Jun 20 13:06:39 2015
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F41F0F98
 for <svn-soc-all@hub.freebsd.org>; Sat, 20 Jun 2015 13:06:38 +0000 (UTC)
 (envelope-from pratiksinghal@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E19DD683
 for <svn-soc-all@FreeBSD.org>; Sat, 20 Jun 2015 13:06:38 +0000 (UTC)
 (envelope-from pratiksinghal@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5KD6cvs092826
 for <svn-soc-all@FreeBSD.org>; Sat, 20 Jun 2015 13:06:38 GMT
 (envelope-from pratiksinghal@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t5KD6c6I092810
 for svn-soc-all@FreeBSD.org; Sat, 20 Jun 2015 13:06:38 GMT
 (envelope-from pratiksinghal@FreeBSD.org)
Date: Sat, 20 Jun 2015 13:06:38 GMT
Message-Id: <201506201306.t5KD6c6I092810@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 pratiksinghal@FreeBSD.org using -f
From: pratiksinghal@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r287381 -
 soc2015/pratiksinghal/cubie-head/sys/arm/allwinner
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2015 13:06:39 -0000

Author: pratiksinghal
Date: Sat Jun 20 13:06:37 2015
New Revision: 287381
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287381

Log:
  Fixed errors in previous commit

Modified:
  soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c

Modified: soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c
==============================================================================
--- soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c	Sat Jun 20 12:43:54 2015	(r287380)
+++ soc2015/pratiksinghal/cubie-head/sys/arm/allwinner/a10_mmc.c	Sat Jun 20 13:06:37 2015	(r287381)
@@ -295,7 +295,7 @@
 	rem = min(len,cmd->data->len) ;
 	uint32_t error = bus_dmamap_load(sc->a10_dma_buff_tag, sc->a10_dma_buff_map,
 					cmd->data->data,rem,a10_dma_buff_cb,
-					&sc->a10_dma_nsegs,0) ;
+					sc,0) ;
 	if (error == EINPROGRESS) {
 		for( ; sc->a10_dma_nsegs == 0 ; )  { }
 	}
@@ -394,7 +394,8 @@
 		return  ;
 	}
 	int i ; 
-	*(uint32_t*)arg = nsegs ; 
+	struct a10_mmc_softc* sc = (struct a10_mmc_softc*) arg ; 
+	sc->a10_dma_nsegs = nsegs ; 
 	for(i=0; i<nsegs; i++) { 
 		sc->a10_dma_buff_addrs[i] = segs[i].ds_addr ; 
 		sc->a10_dma_buff_sizes[i] = segs[i].ds_len ;