On 12/11/19 1:15 PM, Sean Nyekjaer wrote:
>
>
> On 11/12/2019 13.10, Marc Kleine-Budde wrote:
>> On 12/11/19 12:28 PM, Sean Nyekjaer wrote:
>>> On 11/12/2019 10.44, Marc Kleine-Budde wrote:
>>>> On 12/11/19 10:13 AM, Sean Nyekjaer wrote:
>>>>>>> When the tcan device comes out of reset it comes out in standby mode.
>>>>>>> The m_can driver tries to access the control register but fails due to
>>>>>>> the device is in standby mode.
>>>>>>> So this patch will put the tcan device in normal mode before the m_can
>>>>>>> driver does the initialization.
>>>>>>>
>>>>>>> Fixes: a229abeed7f7 ("can: tcan4x5x: Turn on the power before parsing the config")
>>>>>>> Cc: stable@xxxxxxxxxxxxxxx
>>>>>>> Signed-off-by: Sean Nyekjaer <sean@xxxxxxxxxx>
>>>>>>
>>>>>> Applied both to linux-can.
>>>>>
>>>>> Oh, the commit id for "can: tcan4x5x: Turn on the power before parsing
>>>>> the config" have changed, since this morning :)
>>>>
>>>> Ahh, I see.
>>>>
>>>> Until there is a pull request (including a tag) the testing branch is
>>>> subject to rebase. Meaning, when there is a patch, that needs update I'm
>>>> happy to squash things into it.
>>>>
>>>> I'm squashing there two commits into one:
>>>
>>> It's two different authors :-)
>>
>> No problem with me. I don't want to have a known broken patch in one
>> pull request that gets fixed by another patch in that pull request.
>
> No problem with me, either.
> But it's not exactly the same problem they are fixing. They can exist
> separately.
>
> Just do a you find best...
If they do different things, you don't need a fixed tag from one to the
other...
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
