summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-09 20:10:21 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-09 20:10:21 -0500
commit90fd50004798d9714ebc3e11f340c248decbddec (patch)
tree9ba49503eb4480bf0f5745edd6f4622d540ae32e
parent7f0ff203cb019e0af0cd9aa401f40d9e9e8fbf09 (diff)
downloadlongterm-queue-4.8-90fd50004798d9714ebc3e11f340c248decbddec.tar.gz
staging: trivial whitespace context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/staging-comedi-jr3_pci-fix-possible-null-pointer-der.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/staging-comedi-jr3_pci-fix-possible-null-pointer-der.patch b/queue/staging-comedi-jr3_pci-fix-possible-null-pointer-der.patch
index 469f63e..b5617fb 100644
--- a/queue/staging-comedi-jr3_pci-fix-possible-null-pointer-der.patch
+++ b/queue/staging-comedi-jr3_pci-fix-possible-null-pointer-der.patch
@@ -1,4 +1,4 @@
-From 45292be0b3db0b7f8286683b376e2d9f949d11f9 Mon Sep 17 00:00:00 2001
+From 8d8eac952a8082b8f10f77126460fe68f64d5306 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 17 Feb 2017 11:09:08 +0000
Subject: [PATCH] staging: comedi: jr3_pci: fix possible null pointer
@@ -26,10 +26,10 @@ Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
-index 70390de66e0e..25909a936e7c 100644
+index 6c4ff023717f..d7e2fd438576 100644
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
-@@ -727,11 +727,12 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
+@@ -726,11 +726,12 @@ static int jr3_pci_auto_attach(struct comedi_device *dev,
s->insn_read = jr3_pci_ai_insn_read;
spriv = jr3_pci_alloc_spriv(dev, s);
@@ -46,7 +46,7 @@ index 70390de66e0e..25909a936e7c 100644
+ s->maxdata_list = spriv->maxdata_list;
}
- /* Reset DSP card */
+ /* Reset DSP card */
--
2.12.0