Sync to upstream 1f0f88dc7295852d614eaf5b55be44a5e9499047

Remove extraneous parameter

Fix free-at-wrong-IRQL bug

Signed-off-by: Ben Chalmers <Ben.Chalmers@citrix.com>