Merge tag 'v3.10.99' into update

This is the 3.10.99 stable release
2018-03-21 22:51:42 +01:00
parent 647f2da1e2 e39c17904a
commit d09f889ac9
98 changed files with 476 additions and 281 deletions
@@ -423,7 +423,7 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask)
 	if (!iomap)
 		return;

-	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+	for (i = 0; i < PCIM_IOMAP_MAX; i++) {
 		if (!(mask & (1 << i)))
 			continue;