diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-29 21:09:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-07 11:56:35 -0400 |
commit | ca288ca1de5957cb50e170dcdb5375c0e6467405 (patch) | |
tree | 4df389b47c585dcf9edd0414c73d3e3be701e289 /drivers | |
parent | 034199be7b5b9efd9b99f34fe2f229f15e166865 (diff) |
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 <B29397@freescale.com>
Cc: Ramneek Mehresh <ramneek.mehresh@freescale.com>
Cc: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/host/fsl-mph-dr-of.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c index 8388771c0c0..79a66d622f9 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( | |||
93 | pdev->dev.parent = &ofdev->dev; | 93 | pdev->dev.parent = &ofdev->dev; |
94 | 94 | ||
95 | pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask; | 95 | pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask; |
96 | pdev->dev.dma_mask = &pdev->archdata.dma_mask; | ||
96 | *pdev->dev.dma_mask = *ofdev->dev.dma_mask; | 97 | *pdev->dev.dma_mask = *ofdev->dev.dma_mask; |
97 | 98 | ||
98 | retval = platform_device_add_data(pdev, pdata, sizeof(*pdata)); | 99 | retval = platform_device_add_data(pdev, pdata, sizeof(*pdata)); |