Skip to content

Commit 6315d93

Browse files
owniamarckleinebudde
authored andcommitted
can: rockchip_canfd: fix broken quirks checks
First get the devtype_data then check quirks. Fixes: bbdffb3 ("can: rockchip_canfd: add quirk for broken CAN-FD support") Signed-off-by: Weizhao Ouyang <[email protected]> Reviewed-by: Vincent Mailhol <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 8b18794 commit 6315d93

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/net/can/rockchip/rockchip_canfd-core.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -902,15 +902,16 @@ static int rkcanfd_probe(struct platform_device *pdev)
902902
priv->can.data_bittiming_const = &rkcanfd_data_bittiming_const;
903903
priv->can.ctrlmode_supported = CAN_CTRLMODE_LOOPBACK |
904904
CAN_CTRLMODE_BERR_REPORTING;
905-
if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN))
906-
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
907905
priv->can.do_set_mode = rkcanfd_set_mode;
908906
priv->can.do_get_berr_counter = rkcanfd_get_berr_counter;
909907
priv->ndev = ndev;
910908

911909
match = device_get_match_data(&pdev->dev);
912-
if (match)
910+
if (match) {
913911
priv->devtype_data = *(struct rkcanfd_devtype_data *)match;
912+
if (!(priv->devtype_data.quirks & RKCANFD_QUIRK_CANFD_BROKEN))
913+
priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD;
914+
}
914915

915916
err = can_rx_offload_add_manual(ndev, &priv->offload,
916917
RKCANFD_NAPI_WEIGHT);

0 commit comments

Comments
 (0)