drivers: can: fix can_configure() when CAN-FD is enabled

henrikbrixandersen · carlescufi · commit 8d5a0664d29a · 2021-12-02T10:55:03.000+01:00
Currently, can_configure() pass a hard-coded 0 for the data bitrate (which is only used for CAN-FD), breaking this API for CAN-FD enabled applications. Instead pass in the provided bitrate for both arbitration phase and data phase. Fixes: #34375 Signed-off-by: Henrik Brix Andersen <hebad@vestas.com>
diff --git a/include/drivers/can.h b/include/drivers/can.h
@@ -860,7 +860,7 @@ __deprecated static inline int can_configure(const struct device *dev, enum can_
 					     uint32_t bitrate)
 {
 	if (bitrate > 0) {
-		int err = can_set_bitrate(dev, bitrate, 0);
+		int err = can_set_bitrate(dev, bitrate, bitrate);
 		if (err != 0) {
 			return err;
 		}
@@ -869,7 +869,6 @@ __deprecated static inline int can_configure(const struct device *dev, enum can_
 	return can_set_mode(dev, mode);
 }
 
-
 /**
  * @brief Get current state
  *

Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ __deprecated static inline int can_configure(const struct device *dev, enum can_`
`860`	`860`	`uint32_t bitrate)`
`861`	`861`	`{`
`862`	`862`	`if (bitrate > 0) {`
`863`		`- int err = can_set_bitrate(dev, bitrate, 0);`
	`863`	`+ int err = can_set_bitrate(dev, bitrate, bitrate);`
`864`	`864`	`if (err != 0) {`
`865`	`865`	`return err;`
`866`	`866`	`}`
`@@ -869,7 +869,6 @@ __deprecated static inline int can_configure(const struct device *dev, enum can_`
`869`	`869`	`return can_set_mode(dev, mode);`
`870`	`870`	`}`
`871`	`871`
`872`		`-`
`873`	`872`	`/**`
`874`	`873`	`* @brief Get current state`
`875`	`874`	`*`