diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 20:08:30 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 20:08:30 +0000 |
| commit | 87f854059aa3c703a87e08649801b15c93b845e7 (patch) | |
| tree | 0ca977f242f1617f1a337e4de631975464a71660 /target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch | |
| parent | 232c61742e7391edeb7c429ab9cc14652c2894ac (diff) | |
| download | upstream-87f854059aa3c703a87e08649801b15c93b845e7.tar.gz upstream-87f854059aa3c703a87e08649801b15c93b845e7.tar.bz2 upstream-87f854059aa3c703a87e08649801b15c93b845e7.zip | |
kernel: fix more bgmac dma init/cleanup issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45422
Diffstat (limited to 'target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch b/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch index 16bb64870d..423b204aa0 100644 --- a/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch +++ b/target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch @@ -152,15 +152,18 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> err = request_irq(bgmac->core->irq, bgmac_interrupt, IRQF_SHARED, KBUILD_MODNAME, net_dev); -@@ -1273,6 +1270,7 @@ static int bgmac_open(struct net_device +@@ -1271,8 +1268,10 @@ static int bgmac_open(struct net_device + phy_start(bgmac->phy_dev); + netif_carrier_on(net_dev); ++ return 0; err_out: + bgmac_dma_cleanup(bgmac); return err; } -@@ -1289,6 +1287,7 @@ static int bgmac_stop(struct net_device +@@ -1289,6 +1288,7 @@ static int bgmac_stop(struct net_device free_irq(bgmac->core->irq, net_dev); bgmac_chip_reset(bgmac); |