2 files changed, 3 insertions, 0 deletions

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index d433f27e0ce2..aa25f8b09fe3 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -68,6 +68,7 @@ static struct attribute *aoe_attrs[] = {
         &disk_attr_mac.attr,
         &disk_attr_netif.attr,
         &disk_attr_fwver.attr,
+        NULL
 };
 
 static const struct attribute_group attr_group = {
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 2788b8ca9bb1..6f9d880ab2e9 100644
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -215,6 +215,8 @@ static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_devi
         return 0;
 
 err_out_free_device:
+        if (dev->virt_addr)
+                iounmap(dev->virt_addr);
         kfree(dev);
 
         return err;