Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/amlogic relax an assertion when transferring da...



details:   https://anonhg.NetBSD.org/src/rev/adb77c767921
branches:  trunk
changeset: 336643:adb77c767921
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Mar 08 15:38:25 2015 +0000

description:
relax an assertion when transferring data; dma seg length doesnt have to be exactly the length of the data transfer, but it needs to be at least as big

diffstat:

 sys/arch/arm/amlogic/amlogic_sdhc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 55041a1542cd -r adb77c767921 sys/arch/arm/amlogic/amlogic_sdhc.c
--- a/sys/arch/arm/amlogic/amlogic_sdhc.c       Sun Mar 08 15:22:02 2015 +0000
+++ b/sys/arch/arm/amlogic/amlogic_sdhc.c       Sun Mar 08 15:38:25 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_sdhc.c,v 1.1 2015/03/08 12:44:55 jmcneill Exp $ */
+/* $NetBSD: amlogic_sdhc.c,v 1.2 2015/03/08 15:38:25 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amlogic_sdhc.c,v 1.1 2015/03/08 12:44:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amlogic_sdhc.c,v 1.2 2015/03/08 15:38:25 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -499,7 +499,7 @@
 
        if (cmd->c_datalen > 0) {
                KASSERT(cmd->c_dmamap->dm_nsegs == 1);
-               KASSERT(cmd->c_dmamap->dm_segs[0].ds_len == cmd->c_datalen);
+               KASSERT(cmd->c_dmamap->dm_segs[0].ds_len >= cmd->c_datalen);
                SDHC_WRITE(sc, SD_ADDR_REG, cmd->c_dmamap->dm_segs[0].ds_addr);
        }
 



Home | Main Index | Thread Index | Old Index