aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 16:40:04 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 16:40:04 -0800
commit1b9bb3c14c60324b54645ffefbe6d270f9fd191c (patch)
treee22157379c9b826f9691a0a9af0be7f08cc68d37
parent0e12c5e85e6fe0a247d547a28a1884915cd3f5b9 (diff)
parentd355c3c23ce56ab83e41f2bfb30d02fb90618530 (diff)
downloadlinux-hpc-1b9bb3c14c60324b54645ffefbe6d270f9fd191c.tar.gz
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
-rw-r--r--drivers/block/aoe/aoeblk.c1
-rw-r--r--drivers/w1/masters/matrox_w1.c2
-rw-r--r--fs/debugfs/inode.c4
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index d433f27e0ce252..aa25f8b09fe309 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 2788b8ca9bb1e8..6f9d880ab2e9e0 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;
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index e77676df6713de..a736d44989c461 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -147,13 +147,13 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
*dentry = NULL;
mutex_lock(&parent->d_inode->i_mutex);
*dentry = lookup_one_len(name, parent, strlen(name));
- if (!IS_ERR(dentry)) {
+ if (!IS_ERR(*dentry)) {
if ((mode & S_IFMT) == S_IFDIR)
error = debugfs_mkdir(parent->d_inode, *dentry, mode);
else
error = debugfs_create(parent->d_inode, *dentry, mode);
} else
- error = PTR_ERR(dentry);
+ error = PTR_ERR(*dentry);
mutex_unlock(&parent->d_inode->i_mutex);
return error;