Module Name: src Committed By: jmcneill Date: Sun Mar 8 15:38:25 UTC 2015
Modified Files: src/sys/arch/arm/amlogic: amlogic_sdhc.c Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/amlogic_sdhc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/amlogic/amlogic_sdhc.c diff -u src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.1 src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.2 --- src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.1 Sun Mar 8 12:44:55 2015 +++ src/sys/arch/arm/amlogic/amlogic_sdhc.c Sun Mar 8 15:38:25 2015 @@ -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 <jmcne...@invisible.ca> @@ -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 @@ amlogic_sdhc_exec_command(sdmmc_chipset_ 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); }