Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf5675a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  driver core: documentation: make it clear that sysfs is optional
  driver core: sysdev: do not send KOBJ_ADD uevent if kobject_init_and_add fails
  Dynamic debug: fix typo: -/->
  driver core: firmware_class:fix memory leak of page pointers array
  sysfs: fix hardlink count on device_move
parents b7ebbb77 a39ea210

Documentation/filesystems/sysfs.txt

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ interface. 
Using sysfs

~~~~~~~~~~~



sysfs is always compiled in. You can access it by doing:

sysfs is always compiled in if CONFIG_SYSFS is defined. You can access

it by doing:



    mount -t sysfs sysfs /sys

drivers/base/firmware_class.c

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ static ssize_t firmware_loading_store(struct device *dev, 
				goto err;

			}

			/* Pages will be freed by vfree() */

			fw_priv->pages = NULL;

			fw_priv->page_array_size = 0;

			fw_priv->nr_pages = 0;

			complete(&fw_priv->completion);

drivers/base/sys.c

+1 −1
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ int sysdev_register(struct sys_device *sysdev) 
				drv->add(sysdev);

		}

		mutex_unlock(&sysdev_drivers_lock);

		kobject_uevent(&sysdev->kobj, KOBJ_ADD);

	}



	kobject_uevent(&sysdev->kobj, KOBJ_ADD);

	return error;

}

fs/sysfs/dir.c

+2 −0
Original line number Diff line number Diff line
@@ -939,8 +939,10 @@ again: 
	/* Remove from old parent's list and insert into new parent's list. */

	sysfs_unlink_sibling(sd);

	sysfs_get(new_parent_sd);

	drop_nlink(old_parent->d_inode);

	sysfs_put(sd->s_parent);

	sd->s_parent = new_parent_sd;

	inc_nlink(new_parent->d_inode);

	sysfs_link_sibling(sd);



 out_unlock:

lib/dynamic_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ static void ddebug_change(const struct ddebug_query *query, 


			if (!newflags)

				dt->num_enabled--;

			else if (!dp-flags)

			else if (!dp->flags)

				dt->num_enabled++;

			dp->flags = newflags;

			if (newflags) {