| Message ID | 20220421135148.2890823-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 60d78e9fce8886b403a21fecb0dd13f9c0f12e1f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ethernet: broadcom/sb1250-mac: remove BUG_ON in sbmac_probe() | expand |
Hello: This patch was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 21 Apr 2022 21:51:48 +0800 you wrote: > Replace the BUG_ON() with returning error code to handle > the fault more gracefully. > > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> > --- > drivers/net/ethernet/broadcom/sb1250-mac.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Here is the summary with links: - ethernet: broadcom/sb1250-mac: remove BUG_ON in sbmac_probe() https://git.kernel.org/netdev/net-next/c/60d78e9fce88 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/sb1250-mac.c b/drivers/net/ethernet/broadcom/sb1250-mac.c index a1a38456c9a3..5d5f10180158 100644 --- a/drivers/net/ethernet/broadcom/sb1250-mac.c +++ b/drivers/net/ethernet/broadcom/sb1250-mac.c @@ -2534,7 +2534,12 @@ static int sbmac_probe(struct platform_device *pldev) int err; res = platform_get_resource(pldev, IORESOURCE_MEM, 0); - BUG_ON(!res); + if (!res) { + printk(KERN_ERR "%s: failed to get resource\n", + dev_name(&pldev->dev)); + err = -EINVAL; + goto out_out; + } sbm_base = ioremap(res->start, resource_size(res)); if (!sbm_base) { printk(KERN_ERR "%s: unable to map device registers\n",
Replace the BUG_ON() with returning error code to handle the fault more gracefully. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/net/ethernet/broadcom/sb1250-mac.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)