summaryrefslogtreecommitdiffstats
path: root/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-26 07:49:10 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-26 07:49:45 -0400
commitb3cc05f52ffad6a4bcf5871b232c63c603d76091 (patch)
tree2288f7cc9bb537fdbb21108bbb7d79b557d6fdf0 /usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
parentd2357b52866e7b0e177771ad4bba17e11ea5a9b7 (diff)
downloadkernel-b3cc05f52ffad6a4bcf5871b232c63c603d76091.tar.gz
kernel-b3cc05f52ffad6a4bcf5871b232c63c603d76091.tar.xz
kernel-b3cc05f52ffad6a4bcf5871b232c63c603d76091.zip
Run dos2unix on recently added patch files
^M characters... they make my eyes BLEED
Diffstat (limited to 'usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch')
-rw-r--r--usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch88
1 files changed, 44 insertions, 44 deletions
diff --git a/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch b/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
index 37ada093b..eed83c55f 100644
--- a/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
+++ b/usb-make-xhci-platform-driver-use-64-bit-or-32-bit-D.patch
@@ -1,44 +1,44 @@
-From 30b01a7a85c0a2993870f7ed93059f9957bff59f Mon Sep 17 00:00:00 2001
-From: Mark Langsdorf <mlangsdo@redhat.com>
-Date: Wed, 25 Mar 2015 14:12:51 -0400
-Subject: [PATCH 3/4] usb: make xhci platform driver use 64 bit or 32 bit DMA
-
-The xhci platform driver needs to work on systems that either only
-support 64-bit DMA or only support 32-bit DMA. Attempt to set a
-coherent dma mask for 64-bit DMA, and attempt again with 32-bit
-DMA if that fails.
-
-Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>
----
- drivers/usb/host/xhci-plat.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 0e11d61..cc5ca2c 100644
---- a/drivers/usb/host/xhci-plat.c
-+++ b/drivers/usb/host/xhci-plat.c
-@@ -83,14 +83,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
- if (irq < 0)
- return -ENODEV;
-
-- /* Initialize dma_mask and coherent_dma_mask to 32-bits */
-- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
-- if (ret)
-- return ret;
-- if (!pdev->dev.dma_mask)
-- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
-- else
-- dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
-+ /* Try setting the coherent_dma_mask to 64 bits, then try 32 bits */
-+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
-+ if (ret) {
-+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
-+ if (ret)
-+ return ret;
-+ }
-
- hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
- if (!hcd)
---
-1.9.3
-
+From 30b01a7a85c0a2993870f7ed93059f9957bff59f Mon Sep 17 00:00:00 2001
+From: Mark Langsdorf <mlangsdo@redhat.com>
+Date: Wed, 25 Mar 2015 14:12:51 -0400
+Subject: [PATCH 3/4] usb: make xhci platform driver use 64 bit or 32 bit DMA
+
+The xhci platform driver needs to work on systems that either only
+support 64-bit DMA or only support 32-bit DMA. Attempt to set a
+coherent dma mask for 64-bit DMA, and attempt again with 32-bit
+DMA if that fails.
+
+Signed-off-by: Mark Langsdorf <mlangsdo@redhat.com>
+---
+ drivers/usb/host/xhci-plat.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
+index 0e11d61..cc5ca2c 100644
+--- a/drivers/usb/host/xhci-plat.c
++++ b/drivers/usb/host/xhci-plat.c
+@@ -83,14 +83,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
+ if (irq < 0)
+ return -ENODEV;
+
+- /* Initialize dma_mask and coherent_dma_mask to 32-bits */
+- ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+- if (ret)
+- return ret;
+- if (!pdev->dev.dma_mask)
+- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+- else
+- dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
++ /* Try setting the coherent_dma_mask to 64 bits, then try 32 bits */
++ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
++ if (ret) {
++ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
++ if (ret)
++ return ret;
++ }
+
+ hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
+ if (!hcd)
+--
+1.9.3
+