OSDN Git Service

Revert "usb: Fix build error due to dma_mask is not at pdev_archdata at ARM"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Apr 2012 01:09:01 +0000 (18:09 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 7 May 2012 15:56:35 +0000 (08:56 -0700)
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

index 8388771..79a66d6 100644 (file)
@@ -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));