diff --git a/drivers/storage/classpnp/class.c b/drivers/storage/classpnp/class.c
index 8551c827b39..2da38e04de8 100644
--- a/drivers/storage/classpnp/class.c
+++ b/drivers/storage/classpnp/class.c
@@ -2485,7 +2485,7 @@ ClassIoComplete(
             retry = TRUE;
         }
 
-        if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) {
+        if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) {
 
             //
             // Retry request.
diff --git a/drivers/storage/classpnp/obsolete.c b/drivers/storage/classpnp/obsolete.c
index 400962aac17..c0d6792d9cb 100644
--- a/drivers/storage/classpnp/obsolete.c
+++ b/drivers/storage/classpnp/obsolete.c
@@ -161,7 +161,7 @@ ClassIoCompleteAssociated(
             retry = TRUE;
         }
 
-        if (retry && ((*(char*)&irpStack->Parameters.Others.Argument4)--)) {
+        if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) {
 
             //
             // Retry request. If the class driver has supplied a StartIo,