diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-06 02:21:03 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-06 02:21:03 -0500 |
| commit | 3c241f8337542655ee013a661b7f1770f561d3ef (patch) | |
| tree | 79dd9a5dd12d305e1be7b926d414855377d2e192 /drivers/atm/fore200e.c | |
| parent | dbf4ccd6043e58ed32fbf253fb3f0a9991e4c13a (diff) | |
| parent | eae936e21bd726f9d9555f2262d439fbcd61dccf (diff) | |
| download | kernel_samsung_smdk4412-3c241f8337542655ee013a661b7f1770f561d3ef.zip kernel_samsung_smdk4412-3c241f8337542655ee013a661b7f1770f561d3ef.tar.gz kernel_samsung_smdk4412-3c241f8337542655ee013a661b7f1770f561d3ef.tar.bz2 | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/atm/fore200e.c')
| -rw-r--r-- | drivers/atm/fore200e.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 9e65bfb..5f70219 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -383,8 +383,7 @@ fore200e_shutdown(struct fore200e* fore200e) switch(fore200e->state) { case FORE200E_STATE_COMPLETE: - if (fore200e->stats) - kfree(fore200e->stats); + kfree(fore200e->stats); case FORE200E_STATE_IRQ: free_irq(fore200e->irq, fore200e->atm_dev); @@ -963,8 +962,7 @@ fore200e_tx_irq(struct fore200e* fore200e) entry, txq->tail, entry->vc_map, entry->skb); /* free copy of misaligned data */ - if (entry->data) - kfree(entry->data); + kfree(entry->data); /* remove DMA mapping */ fore200e->bus->dma_unmap(fore200e, entry->tpd->tsd[ 0 ].buffer, entry->tpd->tsd[ 0 ].length, |