Home Explore Help
Register Sign In
wareck
/
openwrt_lede
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
openwrt_lede
/
target
/
linux
/
brcm2708
/
patches-4.4
/
0535-rpi-ft5406-Pass-device-structure-into-dma_zalloc_coh.patch

0535-rpi-ft5406-Pass-device-structure-into-dma_zalloc_coh.patch 1.4 KB
Permalink History Raw

1234567891011121314151617181920212223242526272829303132333435363738 
  1. From caae57f942bb200e8bf32db60e124e7a2ce798e0 Mon Sep 17 00:00:00 2001
    2. 

  2. From: popcornmix <popcornmix@gmail.com>
    3. 

  3. Date: Mon, 14 Nov 2016 20:14:21 +0000
    4. 

  4. Subject: [PATCH] rpi-ft5406: Pass device structure into dma_zalloc_coherent
    5. 

  5. 

  6. ---
    7. 

  7.  drivers/input/touchscreen/rpi-ft5406.c | 6 +++---
    8. 

  8.  1 file changed, 3 insertions(+), 3 deletions(-)
    9. 

  9. 

  10. --- a/drivers/input/touchscreen/rpi-ft5406.c
    11. 

  11. +++ b/drivers/input/touchscreen/rpi-ft5406.c
    12. 

  12. @@ -151,7 +151,7 @@ static int ft5406_probe(struct platform_
    13. 

  13.  		return -ENOMEM;
    14. 

  14.  	}
    15. 

  15.  
    16. 

  16. -	ts->ts_base = dma_zalloc_coherent(NULL, PAGE_SIZE, &ts->bus_addr, GFP_KERNEL);
    17. 

  17. +	ts->ts_base = dma_zalloc_coherent(dev, PAGE_SIZE, &ts->bus_addr, GFP_KERNEL);
    18. 

  18.  	if (!ts->ts_base) {
    19. 

  19.  		pr_err("[%s]: failed to dma_alloc_coherent(%ld)\n",
    20. 

  20.  				__func__, PAGE_SIZE);
    21. 

  21. @@ -165,7 +165,7 @@ static int ft5406_probe(struct platform_
    22. 

  22.  
    23. 

  23.  	if (err || touchbuf != 0) {
    24. 

  24.  		dev_warn(dev, "Failed to set touchbuf, trying to get err:%x\n", err);
    25. 

  25. -		dma_free_coherent(NULL, PAGE_SIZE, ts->ts_base, ts->bus_addr);
    26. 

  26. +		dma_free_coherent(dev, PAGE_SIZE, ts->ts_base, ts->bus_addr);
    27. 

  27.  		ts->ts_base = 0;
    28. 

  28.  		ts->bus_addr = 0;
    29. 

  29.  	}
    30. 

  30. @@ -238,7 +238,7 @@ static int ft5406_probe(struct platform_
    31. 

  31.  
    32. 

  32.  out:
    33. 

  33.  	if (ts->bus_addr) {
    34. 

  34. -		dma_free_coherent(NULL, PAGE_SIZE, ts->ts_base, ts->bus_addr);
    35. 

  35. +		dma_free_coherent(dev, PAGE_SIZE, ts->ts_base, ts->bus_addr);
    36. 

  36.  		ts->bus_addr = 0;
    37. 

  37.  		ts->ts_base = NULL;
    38. 

  38.  	} else if (ts->ts_base) {
    39.