Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaafb8cf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: ehci-msm2: Set dma bit mask to 32"

parents 9d35553b 45afad6e

drivers/usb/host/ehci-msm.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static const struct ehci_driver_overrides ehci_msm_overrides __initdata = { 
	.reset = ehci_msm_reset,

};



static u64 msm_ehci_dma_mask = DMA_BIT_MASK(64);

static u64 msm_ehci_dma_mask = DMA_BIT_MASK(32);

static int ehci_msm_probe(struct platform_device *pdev)

{

	struct usb_hcd *hcd;
@@ -94,7 +94,7 @@ static int ehci_msm_probe(struct platform_device *pdev) 
	if (!pdev->dev.dma_mask)

		pdev->dev.dma_mask = &msm_ehci_dma_mask;

	if (!pdev->dev.coherent_dma_mask)

		pdev->dev.coherent_dma_mask = DMA_BIT_MASK(64);

		pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);



	hcd = usb_create_hcd(&ehci_msm_hc_driver, &pdev->dev,

			     dev_name(&pdev->dev));

drivers/usb/host/ehci-msm2.c

+1 −1
Original line number Diff line number Diff line
@@ -1309,7 +1309,7 @@ struct msm_usb_host_platform_data *ehci_msm2_dt_to_pdata( 
	return pdata;

}



static u64 ehci_msm_dma_mask = DMA_BIT_MASK(64);

static u64 ehci_msm_dma_mask = DMA_BIT_MASK(32);

static int ehci_msm2_probe(struct platform_device *pdev)

{

	struct usb_hcd *hcd;