mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 15:42:46 +00:00
Code Issues Releases Wiki Activity

net: pch_gbe: Propagate error from devm_gpio_request_one()

Browse source 
If GPIO controller is not available yet we need to defer
the probe of GBE until provider will become available.

While here, drop GPIOF_EXPORT because it's deprecated and
may not be available.

Fixes: f1a26fdf59 ("pch_gbe: Add MinnowBoard support")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Flavio Suligoi <f.suligoi@asem.it>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy Shevchenko 2021-05-10 19:39:27 +03:00 committed by David S. Miller
parent 27d6414194
commit 9e3617a7b8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
View file

@ -2532,9 +2532,13 @@ static int pch_gbe_probe(struct pci_dev *pdev,
adapter->pdev = pdev; adapter->pdev = pdev;
adapter->hw.back = adapter; adapter->hw.back = adapter;
adapter->hw.reg = pcim_iomap_table(pdev)[PCH_GBE_PCI_BAR]; adapter->hw.reg = pcim_iomap_table(pdev)[PCH_GBE_PCI_BAR];
adapter->pdata = (struct pch_gbe_privdata *)pci_id->driver_data; adapter->pdata = (struct pch_gbe_privdata *)pci_id->driver_data;
if (adapter->pdata && adapter->pdata->platform_init) if (adapter->pdata && adapter->pdata->platform_init) {
adapter->pdata->platform_init(pdev); ret = adapter->pdata->platform_init(pdev);
if (ret)
goto err_free_netdev;
}
adapter->ptp_pdev = adapter->ptp_pdev =
pci_get_domain_bus_and_slot(pci_domain_nr(adapter->pdev->bus), pci_get_domain_bus_and_slot(pci_domain_nr(adapter->pdev->bus),
@ -2629,7 +2633,7 @@ static int pch_gbe_probe(struct pci_dev *pdev,
*/ */
static int pch_gbe_minnow_platform_init(struct pci_dev *pdev) static int pch_gbe_minnow_platform_init(struct pci_dev *pdev)
{ {
unsigned long flags = GPIOF_DIR_OUT | GPIOF_INIT_HIGH | GPIOF_EXPORT; unsigned long flags = GPIOF_OUT_INIT_HIGH;
unsigned gpio = MINNOW_PHY_RESET_GPIO; unsigned gpio = MINNOW_PHY_RESET_GPIO;
int ret; int ret;