dev/minic: bugfix to prevent wrpc from hanging

0029983e · Cesar Prados · Wesley W. Terpstra · 1850ac3a · 0029983e
Commit 0029983e authored Jan 23, 2015 by Cesar Prados Committed by Wesley W. Terpstra Jan 30, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

minic.c dev/minic.c +4 -3

No files found.
--- a/dev/minic.c
+++ b/dev/minic.c
@@ -267,7 +267,8 @@ int minic_rx_frame(uint8_t * hdr, uint8_t * payload, uint32_t buf_size,
 		minic_rx_memcpy(payload, (void *)minic.rx_head + 4
 				+ ETH_HEADER_SIZE, n_recvd - ETH_HEADER_SIZE);
 	} else {
-		n_recvd = -1;
+	        minic_rxbuf_free(num_words);
+                return -1;
 	}
 	minic_rxbuf_free(num_words);
 	minic.rx_head = (uint32_t *)((uint32_t)minic.rx_base +
@@ -375,11 +376,11 @@ int minic_tx_frame(uint8_t * hdr, uint8_t * payload, uint32_t size,
 		hwts->sec = sec;
 		hwts->ahead = 0;
 		hwts->nsec = counter_r * 8;
-		
+
 //        TRACE_DEV("minic_tx_frame [%d bytes] TS: %d.%d valid %d\n", size, hwts->utc, hwts->nsec, hwts->valid);
 		minic.tx_count++;
        }
-        
+
 	return size;
 }