Fixed merge issue with smartcard_pcsc.c