---

yaml --- r: 330167 b: refs/heads/master c: 18f6287 h: refs/heads/master i: 330165: 4c33443 330163: a3dcfdc 330159: 5364cdf v: v3
git-mirror · Oct 5, 2012 · b046cb8 · b046cb8
1 parent 23f8cd8
commit b046cb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe50c927d7ab17983ab05d3e29e73395dcd577b6
+refs/heads/master: 18f6287f538858135c2c7ed4f76d4441e28b5714
diff --git a/trunk/drivers/rapidio/devices/tsi721.c b/trunk/drivers/rapidio/devices/tsi721.c
@@ -2316,7 +2316,8 @@ static int __devinit tsi721_probe(struct pci_dev *pdev,
 
 	/* Configure DMA attributes. */
 	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
-		if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
+		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+		if (err) {
 			dev_info(&pdev->dev, "Unable to set DMA mask\n");
 			goto err_unmap_bars;
 		}