diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:03:11 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:03:11 -0400 |
| commit | 437a511d6742613ca1851f36aed2b51e1851a6d7 (patch) | |
| tree | 1b0a89beb1a82045d1be202e1de39ef0d92b6707 | |
| parent | 79d49360b142a40aec91519965f8ccab032a7f98 (diff) | |
| download | longterm-queue-4.12-437a511d6742613ca1851f36aed2b51e1851a6d7.tar.gz | |
net: refresh context
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/net-mvmdio-disable-unprepare-clocks-in-EPROBE_DEFER-.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/queue/net-mvmdio-disable-unprepare-clocks-in-EPROBE_DEFER-.patch b/queue/net-mvmdio-disable-unprepare-clocks-in-EPROBE_DEFER-.patch index c4d3ecd..be8dae6 100644 --- a/queue/net-mvmdio-disable-unprepare-clocks-in-EPROBE_DEFER-.patch +++ b/queue/net-mvmdio-disable-unprepare-clocks-in-EPROBE_DEFER-.patch @@ -1,4 +1,4 @@ -From 589bf32f09852041fbd3b7ce1a9e703f95c230ba Mon Sep 17 00:00:00 2001 +From 18b7403508dd933f9e007f15f31ac17b70851ec9 Mon Sep 17 00:00:00 2001 From: Tobias Jordan <Tobias.Jordan@elektrobit.com> Date: Wed, 6 Dec 2017 15:23:23 +0100 Subject: [PATCH] net: mvmdio: disable/unprepare clocks in EPROBE_DEFER case @@ -14,12 +14,13 @@ Fixes: 3d604da1e954 ("net: mvmdio: get and enable optional clock") Signed-off-by: Tobias Jordan <Tobias.Jordan@elektrobit.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c -index c9798210fa0f..0495487f7b42 100644 +index 90a60b98c28e..fcb43307738f 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c -@@ -344,7 +344,8 @@ static int orion_mdio_probe(struct platform_device *pdev) +@@ -241,7 +241,8 @@ static int orion_mdio_probe(struct platform_device *pdev) dev->regs + MVMDIO_ERR_INT_MASK); } else if (dev->err_interrupt == -EPROBE_DEFER) { @@ -28,7 +29,7 @@ index c9798210fa0f..0495487f7b42 100644 + goto out_mdio; } - if (pdev->dev.of_node) + mutex_init(&dev->lock); -- 2.15.0 |