usb: libusb: hub_controller: Fix PnP handler

mvardan · mvardan · commit c48f1cfa0241 · 2016-08-19T16:20:32.000Z
In some cases our driver was changing IRP status in places where it
shouldn't.

svn path=/branches/GSoC_2016/USB/; revision=72378
diff --git a/sdk/lib/drivers/libusb/hub_controller.cpp b/sdk/lib/drivers/libusb/hub_controller.cpp
@@ -568,7 +568,8 @@ CHubController::HandlePnp(
                     break;
                 }
             }
-            Status = STATUS_SUCCESS;
+            // Here we should leave Status as is.
+            Status = Irp->IoStatus.Status;
             break;
         }
         case IRP_MN_QUERY_CAPABILITIES:
@@ -611,6 +612,14 @@ CHubController::HandlePnp(
             // handle device interface requests
             //
             Status = HandleQueryInterface(IoStack);
+
+            //
+            // If a bus driver does not export the requested interface, it
+            // should leave Status as is.
+            //
+            if (Status == STATUS_NOT_SUPPORTED)
+                Status = Irp->IoStatus.Status;
+
             break;
         }
         case IRP_MN_REMOVE_DEVICE:

Original file line number	Diff line number	Diff line change
`@@ -568,7 +568,8 @@ CHubController::HandlePnp(`
`568`	`568`	`break;`
`569`	`569`	`}`
`570`	`570`	`}`
`571`		`- Status = STATUS_SUCCESS;`
	`571`	`+ // Here we should leave Status as is.`
	`572`	`+ Status = Irp->IoStatus.Status;`
`572`	`573`	`break;`
`573`	`574`	`}`
`574`	`575`	`case IRP_MN_QUERY_CAPABILITIES:`
`@@ -611,6 +612,14 @@ CHubController::HandlePnp(`
`611`	`612`	`// handle device interface requests`
`612`	`613`	`//`
`613`	`614`	`Status = HandleQueryInterface(IoStack);`
	`615`	`+`
	`616`	`+ //`
	`617`	`+ // If a bus driver does not export the requested interface, it`
	`618`	`+ // should leave Status as is.`
	`619`	`+ //`
	`620`	`+ if (Status == STATUS_NOT_SUPPORTED)`
	`621`	`+ Status = Irp->IoStatus.Status;`
	`622`	`+`
`614`	`623`	`break;`
`615`	`624`	`}`
`616`	`625`	`case IRP_MN_REMOVE_DEVICE:`