Fix sta090x+saa716x based cards and a bad auto-merge