diff options
author | Biju Das <biju.das@bp.renesas.com> | 2019-10-09 17:12:49 +0100 |
---|---|---|
committer | Kishon Vijay Abraham I <kishon@ti.com> | 2019-10-31 16:54:01 +0530 |
commit | c9baab38fe0e28762d0d67611cbe2aef0fb3fc72 (patch) | |
tree | a078e187f66c167ff81db6c5f61c7faf2116a49e /drivers/phy/renesas/phy-rcar-gen2.c | |
parent | 82b5d164415549e74cfa1f9156ffd4463d0a76e2 (diff) | |
download | linux-c9baab38fe0e28762d0d67611cbe2aef0fb3fc72.tar.gz linux-c9baab38fe0e28762d0d67611cbe2aef0fb3fc72.tar.bz2 linux-c9baab38fe0e28762d0d67611cbe2aef0fb3fc72.zip |
phy: renesas: phy-rcar-gen2: Fix the array off by one warning
Fix the below smatch warning by adding variable check rather than the
hardcoded value.
warn: array off by one? 'data->select_value[channel_num]'
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/renesas/phy-rcar-gen2.c')
-rw-r--r-- | drivers/phy/renesas/phy-rcar-gen2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/phy/renesas/phy-rcar-gen2.c b/drivers/phy/renesas/phy-rcar-gen2.c index 2926e4937301..2e279ac0fa4d 100644 --- a/drivers/phy/renesas/phy-rcar-gen2.c +++ b/drivers/phy/renesas/phy-rcar-gen2.c @@ -71,6 +71,7 @@ struct rcar_gen2_phy_driver { struct rcar_gen2_phy_data { const struct phy_ops *gen2_phy_ops; const u32 (*select_value)[PHYS_PER_CHANNEL]; + const u32 num_channels; }; static int rcar_gen2_phy_init(struct phy *p) @@ -271,11 +272,13 @@ static const u32 usb20_select_value[][PHYS_PER_CHANNEL] = { static const struct rcar_gen2_phy_data rcar_gen2_usb_phy_data = { .gen2_phy_ops = &rcar_gen2_phy_ops, .select_value = pci_select_value, + .num_channels = ARRAY_SIZE(pci_select_value), }; static const struct rcar_gen2_phy_data rz_g1c_usb_phy_data = { .gen2_phy_ops = &rz_g1c_phy_ops, .select_value = usb20_select_value, + .num_channels = ARRAY_SIZE(usb20_select_value), }; static const struct of_device_id rcar_gen2_phy_match_table[] = { @@ -389,7 +392,7 @@ static int rcar_gen2_phy_probe(struct platform_device *pdev) channel->selected_phy = -1; error = of_property_read_u32(np, "reg", &channel_num); - if (error || channel_num > 2) { + if (error || channel_num >= data->num_channels) { dev_err(dev, "Invalid \"reg\" property\n"); of_node_put(np); return error; |