[pvr] fix and cosmetics for #2912

@opdenkamp leak fix and cosmetics for #2912