To merge or not to merge, that is your decision. It's your project.
But please remember, current code has potential risk around SPI.
If you met something weird SPI related trouble, I hope my diff will be a hint to solve it.
To merge or not to merge, that is your decision. It's your project.