On 12/29/19 4:32 PM, Marc Kleine-Budde wrote:
> On 12/12/19 5:15 PM, Dan Murphy wrote:
>> static int tcan4x5x_parse_config(struct m_can_classdev *cdev)
>> {
>> struct tcan4x5x_priv *tcan4x5x = cdev->device_data;
>> @@ -383,8 +393,10 @@ static int tcan4x5x_parse_config(struct m_can_classdev *cdev)
>> tcan4x5x->device_state_gpio = devm_gpiod_get_optional(cdev->dev,
>> "device-state",
>> GPIOD_IN);
>> - if (IS_ERR(tcan4x5x->device_state_gpio))
>> + if (IS_ERR(tcan4x5x->device_state_gpio)) {
>> tcan4x5x->device_state_gpio = NULL;
>> + tcan4x5x_disable_state(cdev);
>> + }
> For some reason, this hunk doesn't apply, due to the additional:
>
>>> tcan4x5x->power = devm_regulator_get_optional(cdev->dev,
>>> "vsup");
...which was my fault. :) Please have a look at
https://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git/log/?h=testing
...if I've collected every m_can related patch.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: OpenPGP digital signature
