From 62808eceb440ca9ad8a2f274712140a7d2a5dc1e Mon Sep 17 00:00:00 2001
From: Joel Shapiro <jshapiro@nvidia.com>
Date: Tue, 29 Oct 2019 11:26:47 -0500
Subject: [PATCH] remove superfluous patch for upstream bug

---
 trunk/PKGBUILD      | 11 +++--------
 trunk/fs62142.patch | 13 -------------
 2 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 trunk/fs62142.patch

diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index a9b2f4b..a8c9ebe 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=nvidia
 pkgname=(nvidia nvidia-dkms)
 pkgver=435.21
-pkgrel=15
+pkgrel=16
 pkgdesc="NVIDIA drivers for linux"
 arch=('x86_64')
 url="https://www.nvidia.com/"
@@ -13,18 +13,13 @@ makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-headers')
 license=('custom')
 options=('!strip')
 _pkg="NVIDIA-Linux-x86_64-${pkgver}"
-source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
-        fs62142.patch)
-sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
-            'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270')
 
 prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
 
-    # Fix https://bugs.archlinux.org/task/62142
-    patch -Np1 -i ../fs62142.patch
-
     cp -a kernel kernel-dkms
     cd kernel-dkms
     sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
diff --git a/trunk/fs62142.patch b/trunk/fs62142.patch
deleted file mode 100644
index 04806bd..0000000
--- a/trunk/fs62142.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
-index 73cdeed..e691014 100644
---- a/kernel/nvidia/nv-dma.c
-+++ b/kernel/nvidia/nv-dma.c
-@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
- #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
-     const struct dma_map_ops *ops = get_dma_ops(&nvl->dev->dev);
- 
--    return (ops->map_resource != NULL);
-+    return (ops && ops->map_resource);
- #else
-     return NV_FALSE;
- #endif
-- 
2.23.0