Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/arm/ep93xx/epcom.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/arm/ep93xx/epcom.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.30 retrieving revision 1.30.18.1 diff -u -p -r1.30 -r1.30.18.1 --- src/sys/arch/arm/ep93xx/epcom.c 2015/04/13 21:18:41 1.30 +++ src/sys/arch/arm/ep93xx/epcom.c 2020/04/13 08:03:34 1.30.18.1 @@ -1,4 +1,4 @@ -/* $NetBSD: epcom.c,v 1.30 2015/04/13 21:18:41 riastradh Exp $ */ +/* $NetBSD: epcom.c,v 1.30.18.1 2020/04/13 08:03:34 martin Exp $ */ /* * Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.30 2015/04/13 21:18:41 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.30.18.1 2020/04/13 08:03:34 martin Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -213,14 +213,9 @@ epcom_attach_subr(struct epcom_softc *sc tp->t_hwiflow = epcomhwiflow; sc->sc_tty = tp; - sc->sc_rbuf = malloc(EPCOM_RING_SIZE << 1, M_DEVBUF, M_NOWAIT); + sc->sc_rbuf = malloc(EPCOM_RING_SIZE << 1, M_DEVBUF, M_WAITOK); sc->sc_rbput = sc->sc_rbget = sc->sc_rbuf; sc->sc_rbavail = EPCOM_RING_SIZE; - if (sc->sc_rbuf == NULL) { - printf("%s: unable to allocate ring buffer\n", - device_xname(sc->sc_dev)); - return; - } sc->sc_ebuf = sc->sc_rbuf + (EPCOM_RING_SIZE << 1); sc->sc_tbc = 0;