It seems weird that a subsystem has a serial. But that's actually how NVMe defines them.
It seems weird that a subsystem has a serial.
Which mean we first need to fix our code to generate a serial number per subsystem, and on top of that the patch from Johannes seems perfectly reasonable.