Merge "usb: xhci-plat: Prevent NULL access in runtime PM" (fcba314d) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/host/xhci-plat.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,9 @@ static int xhci_plat_runtime_suspend(struct device *dev)
		struct usb_hcd *hcd = dev_get_drvdata(dev);
		struct xhci_hcd *xhci = hcd_to_xhci(hcd);

		if (!xhci)
		return 0;

		dev_dbg(dev, "xhci-plat runtime suspend\n");

		return xhci_suspend(xhci);
		@@ -234,6 +237,9 @@ static int xhci_plat_runtime_resume(struct device *dev)
		struct usb_hcd *hcd = dev_get_drvdata(dev);
		struct xhci_hcd *xhci = hcd_to_xhci(hcd);

		if (!xhci)
		return 0;

		dev_dbg(dev, "xhci-plat runtime resume\n");

		return xhci_resume(xhci, false);