If I do anything, it'll be just a simple/total revert of the I2C changes in v506+. But I'm trying to remember why I thought it necessary to add proper locking to the driver.. guarding against something, but what?

Probably unnecessary, unless a third-party app (or Hijack feature?) wants to do I2C accesses without colliding with the main player app..