Re: [PATCH] (23/25) sk98: eliminate Pnmi scratchpad

[Stephen Hemminger <shemminger@xxxxxxxx>]

This fixes the leak in the ethtool statistics code from the last patch.

Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxx>

diff -Nru a/drivers/net/sk98lin/skethtool.c b/drivers/net/sk98lin/skethtool.c
--- a/drivers/net/sk98lin/skethtool.c   2004-11-19 11:40:14 -08:00
+++ b/drivers/net/sk98lin/skethtool.c   2004-11-19 11:40:14 -08:00
@@ -268,7 +268,6 @@
        int err;
        SK_PNMI_STRUCT_DATA *pPnmiStruct;
 
-
        pPnmiStruct = kmalloc(sizeof(*pPnmiStruct), GFP_KERNEL);
        if (!pPnmiStruct)
                return;
@@ -279,8 +278,8 @@
        err = SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &size, 
pNet->NetNr);
        spin_unlock_irqrestore(&pAC->SlowPathLock, flags);
 
-       if (err)
-               return;
+       if (err) 
+               goto out;
 
        *data++ = pPnmiStruct->Stat[0].StatRxOkCts;
        *data++ = pPnmiStruct->Stat[0].StatTxOkCts;
@@ -309,6 +308,9 @@
        *data++ = pPnmiStruct->Stat[0].StatTxFifoUnderrunCts;
        *data++ = pPnmiStruct->Stat[0].StatTxCarrierCts;
        *data++ = pAC->stats.tx_window_errors;
+
+ out:
+       kfree(pPnmiStruct);
 }