lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 05/35] can: rcar_can: Fix erroneous registration
    Date
    From: Fabrizio Castro <fabrizio.castro@bp.renesas.com>

    [ Upstream commit 68c8d209cd4337da4fa04c672f0b62bb735969bc ]

    Assigning 2 to "renesas,can-clock-select" tricks the driver into
    registering the CAN interface, even though we don't want that.
    This patch improves one of the checks to prevent that from happening.

    Fixes: 862e2b6af9413b43 ("can: rcar_can: support all input clocks")
    Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
    Signed-off-by: Chris Paterson <Chris.Paterson2@renesas.com>
    Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/can/rcar/rcar_can.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c
    index 11662f479e76..771a46083739 100644
    --- a/drivers/net/can/rcar/rcar_can.c
    +++ b/drivers/net/can/rcar/rcar_can.c
    @@ -24,6 +24,9 @@

    #define RCAR_CAN_DRV_NAME "rcar_can"

    +#define RCAR_SUPPORTED_CLOCKS (BIT(CLKR_CLKP1) | BIT(CLKR_CLKP2) | \
    + BIT(CLKR_CLKEXT))
    +
    /* Mailbox configuration:
    * mailbox 60 - 63 - Rx FIFO mailboxes
    * mailbox 56 - 59 - Tx FIFO mailboxes
    @@ -789,7 +792,7 @@ static int rcar_can_probe(struct platform_device *pdev)
    goto fail_clk;
    }

    - if (clock_select >= ARRAY_SIZE(clock_names)) {
    + if (!(BIT(clock_select) & RCAR_SUPPORTED_CLOCKS)) {
    err = -EINVAL;
    dev_err(&pdev->dev, "invalid CAN clock selected\n");
    goto fail_clk;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-11-29 07:11    [W:2.878 / U:0.724 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site