Commit 1b9bb3c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0e12c5e8 d355c3c2

drivers/block/aoe/aoeblk.c

+1 −0
Original line number Diff line number Diff line
@@ -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 = {

drivers/w1/masters/matrox_w1.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

fs/debugfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -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;