Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299523
b: refs/heads/master
c: 5f614e6
h: refs/heads/master
i:
  299521: 1a24ac1
  299519: 2f3aa68
v: v3
  • Loading branch information
sjur.brandeland@stericsson.com authored and David S. Miller committed Apr 13, 2012
1 parent bb342b2 commit 62d1d08
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5c699fb7d88d360023f3b3f5291cbf5b59883a1b
refs/heads/master: 5f614e6b7005685b3e34da0742f79389c858c7e1
5 changes: 3 additions & 2 deletions trunk/drivers/net/caif/caif_hsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ int cfhsi_probe(struct platform_device *pdev)

static void cfhsi_shutdown(struct cfhsi *cfhsi)
{
u8 *tx_buf, *rx_buf;
u8 *tx_buf, *rx_buf, *flip_buf;

/* Stop TXing */
netif_tx_stop_all_queues(cfhsi->ndev);
Expand All @@ -1234,7 +1234,7 @@ static void cfhsi_shutdown(struct cfhsi *cfhsi)
/* Store bufferes: will be freed later. */
tx_buf = cfhsi->tx_buf;
rx_buf = cfhsi->rx_buf;

flip_buf = cfhsi->rx_flip_buf;
/* Flush transmit queues. */
cfhsi_abort_tx(cfhsi);

Expand All @@ -1247,6 +1247,7 @@ static void cfhsi_shutdown(struct cfhsi *cfhsi)
/* Free buffers. */
kfree(tx_buf);
kfree(rx_buf);
kfree(flip_buf);
}

int cfhsi_remove(struct platform_device *pdev)
Expand Down

0 comments on commit 62d1d08

Please sign in to comment.