diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 16:40:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-16 16:40:04 -0800 |
| commit | 1b9bb3c14c60324b54645ffefbe6d270f9fd191c (patch) | |
| tree | e22157379c9b826f9691a0a9af0be7f08cc68d37 /drivers | |
| parent | 0e12c5e85e6fe0a247d547a28a1884915cd3f5b9 (diff) | |
| parent | d355c3c23ce56ab83e41f2bfb30d02fb90618530 (diff) | |
| download | lwn-1b9bb3c14c60324b54645ffefbe6d270f9fd191c.tar.gz lwn-1b9bb3c14c60324b54645ffefbe6d270f9fd191c.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
aoe: Add forgotten NULL at end of attribute list in aoeblk.c
debugfs: check return value correctly
W1: ioremap balanced with iounmap
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/aoe/aoeblk.c | 1 | ||||
| -rw-r--r-- | drivers/w1/masters/matrox_w1.c | 2 |
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; |