kernel: cleanup makefile for $CONF.$O target

[plan9front.git] / sys / src / 9 / pc / uartisa.c

diff --git a/sys/src/9/pc/uartisa.c b/sys/src/9/pc/uartisa.c
old mode 100755 (executable)
new mode 100644 (file)
index 7252813..f6b5907
--- a/sys/src/9/pc/uartisa.c
+++ b/sys/src/9/pc/uartisa.c
@@ -18,14 +18,20 @@ uartisa(int ctlrno, ISAConf* isa)
        Uart *uart;
        char buf[64];
 
+       uart = malloc(sizeof(Uart));
+       if(uart == nil){
+               print("uartisa: no memory for Uart\n");
+               return nil;
+       }
+
        io = isa->port;
        snprint(buf, sizeof(buf), "%s%d", isaphysuart.name, ctlrno);
        if(ioalloc(io, 8, 0, buf) < 0){
                print("uartisa: I/O 0x%uX in use\n", io);
+               free(uart);
                return nil;
        }
 
-       uart = malloc(sizeof(Uart));
        ctlr = i8250alloc(io, isa->irq, BUSUNKNOWN);
        if(ctlr == nil){
                iofree(io);