Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/khorben-n900]: src/sys/arch/arm/omap Removed a bogus assertion.
details: https://anonhg.NetBSD.org/src/rev/ea6543a29cd0
branches: khorben-n900
changeset: 786708:ea6543a29cd0
user: khorben <khorben%NetBSD.org@localhost>
date: Sun May 12 20:11:39 2013 +0000
description:
Removed a bogus assertion.
diffstat:
sys/arch/arm/omap/omap2_spi.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diffs (32 lines):
diff -r 617eccacca36 -r ea6543a29cd0 sys/arch/arm/omap/omap2_spi.c
--- a/sys/arch/arm/omap/omap2_spi.c Sun May 12 01:49:44 2013 +0000
+++ b/sys/arch/arm/omap/omap2_spi.c Sun May 12 20:11:39 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2_spi.c,v 1.1.2.2 2013/05/12 01:19:54 khorben Exp $ */
+/* $NetBSD: omap2_spi.c,v 1.1.2.3 2013/05/12 20:11:39 khorben Exp $ */
/*
* Texas Instruments OMAP2/3 Multichannel SPI driver.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_spi.c,v 1.1.2.2 2013/05/12 01:19:54 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_spi.c,v 1.1.2.3 2013/05/12 20:11:39 khorben Exp $");
#include "opt_omap.h"
@@ -408,11 +408,10 @@
omap2_spi_recv(sc, i);
}
- if (chan->wchunk == NULL && chan->rchunk == NULL) {
+ if (chan->wchunk == NULL && chan->rchunk == NULL
+ && chan->transfer != NULL) {
st = chan->transfer;
chan->transfer = NULL;
-
- KASSERT(st != NULL);
spi_done(st, 0);
spi_transq_dequeue(&chan->queue);
Home |
Main Index |
Thread Index |
Old Index