Module Name: src
Committed By: mlelstv
Date: Sun Aug 9 13:03:11 UTC 2015
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_emmc.c
Log Message:
Handle error when setting DMA transfer.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/broadcom/bcm2835_emmc.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/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.26 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.27
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.26 Mon Aug 3 10:27:32 2015
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Sun Aug 9 13:03:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.26 2015/08/03 10:27:32 jmcneill Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.27 2015/08/09 13:03:10 mlelstv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.26 2015/08/03 10:27:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.27 2015/08/09 13:03:10 mlelstv Exp $");
#include "bcmdmac.h"
@@ -309,7 +309,10 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
sc->sc_state = EMMC_DMA_STATE_BUSY;
bcm_dmac_set_conblk_addr(sc->sc_dmac,
sc->sc_dmamap->dm_segs[0].ds_addr);
- bcm_dmac_transfer(sc->sc_dmac);
+ error = bcm_dmac_transfer(sc->sc_dmac);
+ if (error)
+ return error;
+
while (sc->sc_state == EMMC_DMA_STATE_BUSY) {
error = cv_timedwait(&sc->sc_cv, plock, hz * 10);
if (error == EWOULDBLOCK) {
