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 | 2fb7989420a673711f44c4dbc18bca1d85bf77e3 (patch) | |
| tree | 199ae4847d43199e272f596f7d35cf30e007ae41 /target/linux/generic/patches-3.18/077-10-bgmac-simplify-dma-init-cleanup.patch | |
| parent | c08644341187fcc4c599de0caf2686b7b022ea85 (diff) | |
| download | upstream-2fb7989420a673711f44c4dbc18bca1d85bf77e3.tar.gz upstream-2fb7989420a673711f44c4dbc18bca1d85bf77e3.tar.bz2 upstream-2fb7989420a673711f44c4dbc18bca1d85bf77e3.zip | |
kernel: fix more bgmac dma init/cleanup issues
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45422 3c298f89-4303-0410-b956-a3cf2f4a3e73
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); |