Fix DPRAM memory leak when CFG_ALLOC_DPRAM is defined, which
eventually leads to a machine check. This change assures that DPRAM is allocated only once in that case. Signed-off-by: Gary Jennejohn <garyj@denx.de> Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
a07faf7b9a
commit
5fdc215f0b
@ -215,12 +215,14 @@ static int scc_init (struct eth_device *dev, bd_t * bis)
|
|||||||
rxIdx = 0;
|
rxIdx = 0;
|
||||||
txIdx = 0;
|
txIdx = 0;
|
||||||
|
|
||||||
|
if (!rtx) {
|
||||||
#ifdef CFG_ALLOC_DPRAM
|
#ifdef CFG_ALLOC_DPRAM
|
||||||
rtx = (RTXBD *) (immr->im_cpm.cp_dpmem +
|
rtx = (RTXBD *) (immr->im_cpm.cp_dpmem +
|
||||||
dpram_alloc_align (sizeof (RTXBD), 8));
|
dpram_alloc_align (sizeof (RTXBD), 8));
|
||||||
#else
|
#else
|
||||||
rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE);
|
rtx = (RTXBD *) (immr->im_cpm.cp_dpmem + CPM_SCC_BASE);
|
||||||
#endif /* 0 */
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
#if (defined(PA_ENET_RXD) && defined(PA_ENET_TXD))
|
#if (defined(PA_ENET_RXD) && defined(PA_ENET_TXD))
|
||||||
/* Configure port A pins for Txd and Rxd.
|
/* Configure port A pins for Txd and Rxd.
|
||||||
|
Loading…
Reference in New Issue
Block a user