| From dba68b222e510e01a7cd5db2654e356cf2388905 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Sat, 15 Mar 2014 03:11:24 +0300 |
| Subject: sh_eth: exit probe with unknown register layout |
| |
| Exit the driver's probe() method when the register layout is unknown as the |
| driver would cause kernel oops in this case anyway. |
| |
| While at it, move the corresponding error message printout and convert it from |
| pr_err() to dev_err(). |
| |
| Suggested-by: Joe Perches <joe@perches.com> |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 264be2f5a973cc85be3e31d6bf6234b55a256627) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c |
| index 5242fe81ecc7..4d3b5b704b39 100644 |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -2717,7 +2717,6 @@ static const u16 *sh_eth_get_register_offset(int register_type) |
| reg_offset = sh_eth_offset_fast_sh3_sh2; |
| break; |
| default: |
| - pr_err("Unknown register type (%d)\n", register_type); |
| break; |
| } |
| |
| @@ -2873,6 +2872,12 @@ static int sh_eth_drv_probe(struct platform_device *pdev) |
| mdp->cd = (struct sh_eth_cpu_data *)match->data; |
| } |
| mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type); |
| + if (!mdp->reg_offset) { |
| + dev_err(&pdev->dev, "Unknown register type (%d)\n", |
| + mdp->cd->register_type); |
| + ret = -EINVAL; |
| + goto out_release; |
| + } |
| sh_eth_set_default_cpu_data(mdp->cd); |
| |
| /* set function */ |
| -- |
| 2.1.2 |
| |