| From 84c1e86d4ef390ef11c8c4abef9bd5f372163ea5 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Sun, 29 Apr 2012 18:09:01 -0700 |
| Subject: [PATCH] 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> |
| |
| --- |
| drivers/usb/host/fsl-mph-dr-of.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- 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_u |
| 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)); |
