diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-30 16:28:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-02 15:28:19 +0200 |
| commit | e8113b2f90c5662c949b3660f70aeba58a469554 (patch) | |
| tree | d0865eb8a3970dd82294ce77e698d1433b188baa /drivers | |
| parent | 7df44c92854964ff5540756dd47507908e4e63cf (diff) | |
| download | linux-e8113b2f90c5662c949b3660f70aeba58a469554.tar.gz linux-e8113b2f90c5662c949b3660f70aeba58a469554.tar.bz2 linux-e8113b2f90c5662c949b3660f70aeba58a469554.zip | |
Revert "r8169: check that Realtek PHY driver module is loaded"
This reverts commit 85a19b0e31e256e77fd4124804b9cec10619de5e which is
commit f325937735498afb054a0195291bbf68d0b60be5 upstream.
Heiner writes:
commit 85a19b0e31e2 ("r8169: check that Realtek PHY driver
module is loaded") made it accidentally to 4.19 and causes an
issue with Android/x86. Could you please revert it?
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 361ae9e5a2b3..807ef43a3cda 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7433,15 +7433,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) int chipset, region, i; int jumbo_max, rc; - /* Some tools for creating an initramfs don't consider softdeps, then - * r8169.ko may be in initramfs, but realtek.ko not. Then the generic - * PHY driver is used that doesn't work with most chip versions. - */ - if (!driver_find("RTL8201CP Ethernet", &mdio_bus_type)) { - dev_err(&pdev->dev, "realtek.ko not loaded, maybe it needs to be added to initramfs?\n"); - return -ENOENT; - } - dev = devm_alloc_etherdev(&pdev->dev, sizeof (*tp)); if (!dev) return -ENOMEM; |