From: Greg Kroah-Hartman Date: Mon, 30 Apr 2012 01:09:01 +0000 (-0700) Subject: Revert "usb: Fix build error due to dma_mask is not at pdev_archdata at ARM" X-Git-Tag: firefly_0821_release~7541^2~1250 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca288ca1de5957cb50e170dcdb5375c0e6467405;p=firefly-linux-kernel-4.4.55.git Revert "usb: Fix build error due to dma_mask is not at pdev_archdata at ARM" This reverts commit d39514c14bd941232976b68e2750dc725b90e724 which is e90fc3cb087ce5c5f81e814358222cd6d197b5db upstream as it causes oopses on some ppc systems. Reported-by: Chen Peter-B29397 Cc: Ramneek Mehresh Cc: Peter Chen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index 8388771c0c03..79a66d622f9c 100644 --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c @@ -93,6 +93,7 @@ struct platform_device * __devinit fsl_usb2_device_register( pdev->dev.parent = &ofdev->dev; pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask; + pdev->dev.dma_mask = &pdev->archdata.dma_mask; *pdev->dev.dma_mask = *ofdev->dev.dma_mask; retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));