android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pci/host-hisi' into next

Browse Source 
* pci/host-hisi:
  PCI: hisi: Remove redundant error message from hisi_pcie_probe()
This commit is contained in:
Bjorn Helgaas 2016-12-12 11:25:07 -06:00
commit 9fb7454b1d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pci/host/pcie-hisi.c
View File

@ -284,10 +284,8 @@ static int hisi_pcie_probe(struct platform_device *pdev)
reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi");
pp->dbi_base = devm_ioremap_resource(dev, reg);
if (IS_ERR(pp->dbi_base)) {
dev_err(dev, "cannot get rc_dbi base\n");
if (IS_ERR(pp->dbi_base))
return PTR_ERR(pp->dbi_base);
}
ret = hisi_add_pcie_port(hisi_pcie, pdev);
if (ret)