[libata] sata_nv: undo merge error