Module Name: src Committed By: adam Date: Sun Sep 22 09:21:56 UTC 2013
Modified Files: src/sys/dev/ic: sl811hs.c Log Message: Removed duplicated lines introduced in version 1.36. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/sl811hs.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/dev/ic/sl811hs.c diff -u src/sys/dev/ic/sl811hs.c:1.37 src/sys/dev/ic/sl811hs.c:1.38 --- src/sys/dev/ic/sl811hs.c:1.37 Sun Sep 22 06:54:35 2013 +++ src/sys/dev/ic/sl811hs.c Sun Sep 22 09:21:56 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $ */ +/* $NetBSD: sl811hs.c,v 1.38 2013/09/22 09:21:56 adam Exp $ */ /* * Not (c) 2007 Matthew Orgass @@ -85,7 +85,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.38 2013/09/22 09:21:56 adam Exp $"); #include "opt_slhci.h" @@ -2326,12 +2326,6 @@ slhci_dotransfer(struct slhci_softc *sc) PT_ROOT_INTR, sc, spipe, NULL, return); /* Check that this transfer can fit in the remaining memory. */ - spipe, t))) { - LK_SLASSERT(spipe->xfer != NULL, sc, spipe, NULL, return); - LK_SLASSERT(spipe->ptype != PT_ROOT_CTRL && spipe->ptype != - PT_ROOT_INTR, sc, spipe, NULL, return); - - /* Check that this transfer can fit in the remaining memory. */ if (t->len[A] + t->len[B] + spipe->tregs[LEN] + 1 > SL11_MAX_PACKET_SIZE) { DLOG(D_XFER, "Transfer does not fit. alen %d blen %d "