X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fbase%2Fdma-mapping.c;h=e584eddef0a72814e1ebe0ff40866619525d21ef;hb=9db59599ae502b38b27cff6462273f84acd59927;hp=b555ff9dd8fceb176af2f567157165726e9ab314;hpb=bd87c8fb9d2e420e5ddffad0cd1abcadfca75dbd;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index b555ff9dd8fc..e584eddef0a7 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -176,13 +176,10 @@ int dmam_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
 
 	rc = dma_declare_coherent_memory(dev, phys_addr, device_addr, size,
 					 flags);
-	if (rc) {
+	if (!rc)
 		devres_add(dev, res);
-		rc = 0;
-	} else {
+	else
 		devres_free(res);
-		rc = -ENOMEM;
-	}
 
 	return rc;
 }