Hi Bjorn, Thank you very much to review the V1 patch. I reworked the patch as you have suggested. Your suggestion is indeed better and cleaner. Would you please have a look for me? FYI, I did not clear the device structure in aer_isr_one_error() just to avoid over complicated the fix. Also, thank you very much to read thru the caller of pcie_do_fatal_recovery() to ensure no one is using the device structure. Really appricated your extra effort. Thank you, Thomas