All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <1426893517-2511-39-git-send-email-mcgrof@do-not-panic.com>

diff --git a/a/1.txt b/N1/1.txt
index e368005..9d163fe 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -114,10 +114,10 @@ index 65041e1..5bb0153 100644
  static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 @@ -570,10 +565,8 @@ static int __init kyrofb_setup(char *options)
  			nopan = 1;
- 		} else if (strcmp(this_opt, "nowrap") == 0) {
+ 		} else if (strcmp(this_opt, "nowrap") = 0) {
  			nowrap = 1;
 -#ifdef CONFIG_MTRR
- 		} else if (strcmp(this_opt, "nomtrr") == 0) {
+ 		} else if (strcmp(this_opt, "nomtrr") = 0) {
  			nomtrr = 1;
 -#endif
  		} else {
@@ -125,8 +125,7 @@ index 65041e1..5bb0153 100644
  		}
 @@ -691,17 +684,16 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  
- 	currentpar->regbase = deviceInfo.pSTGReg =
- 		ioremap_nocache(kyro_fix.mmio_start, kyro_fix.mmio_len);
+ 	currentpar->regbase = deviceInfo.pSTGReg  		ioremap_nocache(kyro_fix.mmio_start, kyro_fix.mmio_len);
 +	if (!currentpar->regbase)
 +		goto out_free_fb;
  
@@ -138,8 +137,7 @@ index 65041e1..5bb0153 100644
  
 -#ifdef CONFIG_MTRR
  	if (!nomtrr)
--		currentpar->mtrr_handle =
--			mtrr_add(kyro_fix.smem_start,
+-		currentpar->mtrr_handle -			mtrr_add(kyro_fix.smem_start,
 -				 kyro_fix.smem_len,
 -				 MTRR_TYPE_WRCOMB, 1);
 -#endif
diff --git a/a/content_digest b/N1/content_digest
index 36d1738..a2a3d4f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH v1 38/47] video: fbdev: kyrofb: use arch_phys_wc_add() and pci_ioremap_wc_bar()\0"
 ]
 [
-  "Date\0Fri, 20 Mar 2015 16:18:28 -0700\0"
+  "Date\0Fri, 20 Mar 2015 23:18:28 +0000\0"
 ]
 [
   "To\0luto\@amacapital.net",
@@ -157,10 +157,10 @@
   " static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);\n",
   "\@\@ -570,10 +565,8 \@\@ static int __init kyrofb_setup(char *options)\n",
   " \t\t\tnopan = 1;\n",
-  " \t\t} else if (strcmp(this_opt, \"nowrap\") == 0) {\n",
+  " \t\t} else if (strcmp(this_opt, \"nowrap\") = 0) {\n",
   " \t\t\tnowrap = 1;\n",
   "-#ifdef CONFIG_MTRR\n",
-  " \t\t} else if (strcmp(this_opt, \"nomtrr\") == 0) {\n",
+  " \t\t} else if (strcmp(this_opt, \"nomtrr\") = 0) {\n",
   " \t\t\tnomtrr = 1;\n",
   "-#endif\n",
   " \t\t} else {\n",
@@ -168,8 +168,7 @@
   " \t\t}\n",
   "\@\@ -691,17 +684,16 \@\@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n",
   " \n",
-  " \tcurrentpar->regbase = deviceInfo.pSTGReg =\n",
-  " \t\tioremap_nocache(kyro_fix.mmio_start, kyro_fix.mmio_len);\n",
+  " \tcurrentpar->regbase = deviceInfo.pSTGReg  \t\tioremap_nocache(kyro_fix.mmio_start, kyro_fix.mmio_len);\n",
   "+\tif (!currentpar->regbase)\n",
   "+\t\tgoto out_free_fb;\n",
   " \n",
@@ -181,8 +180,7 @@
   " \n",
   "-#ifdef CONFIG_MTRR\n",
   " \tif (!nomtrr)\n",
-  "-\t\tcurrentpar->mtrr_handle =\n",
-  "-\t\t\tmtrr_add(kyro_fix.smem_start,\n",
+  "-\t\tcurrentpar->mtrr_handle -\t\t\tmtrr_add(kyro_fix.smem_start,\n",
   "-\t\t\t\t kyro_fix.smem_len,\n",
   "-\t\t\t\t MTRR_TYPE_WRCOMB, 1);\n",
   "-#endif\n",
@@ -236,4 +234,4 @@
   "2.3.2.209.gd67f9d5.dirty"
 ]
 
-079a2eacd09b23bad73f74e5195fb9994bd8bbf11854d26a725ec0f204878794
+59ba6284bbfeeb7c286a26f57e87928851aba306297c92b995e99703e62f9fa8
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.