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: (27 commits)
  Driver core: fix race in dev_driver_string
  Driver Core: Early platform driver buffer
  sysfs: sysfs_setattr remove unnecessary permission check.
  sysfs: Factor out sysfs_rename from sysfs_rename_dir and sysfs_move_dir
  sysfs: Propagate renames to the vfs on demand
  sysfs: Gut sysfs_addrm_start and sysfs_addrm_finish
  sysfs: In sysfs_chmod_file lazily propagate the mode change.
  sysfs: Implement sysfs_getattr & sysfs_permission
  sysfs: Nicely indent sysfs_symlink_inode_operations
  sysfs: Update s_iattr on link and unlink.
  sysfs: Fix locking and factor out sysfs_sd_setattr
  sysfs: Simplify iattr time assignments
  sysfs: Simplify sysfs_chmod_file semantics
  sysfs: Use dentry_ops instead of directly playing with the dcache
  sysfs: Rename sysfs_d_iput to sysfs_dentry_iput
  sysfs: Update sysfs_setxattr so it updates secdata under the sysfs_mutex
  debugfs: fix create mutex racy fops and private data
  Driver core: Don't remove kobjects in device_shutdown.
  firmware_class: make request_firmware_nowait more useful
  Driver-Core: devtmpfs - set root directory mode to 0755
  ...

1 files changed, 22 insertions, 7 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4fa954b07ac4..9d2ee25deaf5 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -1000,7 +1000,7 @@ static __initdata LIST_HEAD(early_platform_device_list);
 int __init early_platform_driver_register(struct early_platform_driver *epdrv,
                                           char *buf)
 {
-        unsigned long index;
+        char *tmp;
         int n;
 
         /* Simply add the driver to the end of the global list.
@@ -1019,13 +1019,28 @@ int __init early_platform_driver_register(struct early_platform_driver *epdrv,
         if (buf && !strncmp(buf, epdrv->pdrv->driver.name, n)) {
                 list_move(&epdrv->list, &early_platform_driver_list);
 
-                if (!strcmp(buf, epdrv->pdrv->driver.name))
+                /* Allow passing parameters after device name */
+                if (buf[n] == '\0' || buf[n] == ',')
                         epdrv->requested_id = -1;
-                else if (buf[n] == '.' && strict_strtoul(&buf[n + 1], 10,
-                                                         &index) == 0)
-                        epdrv->requested_id = index;
-                else
-                        epdrv->requested_id = EARLY_PLATFORM_ID_ERROR;
+                else {
+                        epdrv->requested_id = simple_strtoul(&buf[n + 1],
+                                                             &tmp, 10);
+
+                        if (buf[n] != '.' || (tmp == &buf[n + 1])) {
+                                epdrv->requested_id = EARLY_PLATFORM_ID_ERROR;
+                                n = 0;
+                        } else
+                                n += strcspn(&buf[n + 1], ",") + 1;
+                }
+
+                if (buf[n] == ',')
+                        n++;
+
+                if (epdrv->bufsize) {
+                        memcpy(epdrv->buffer, &buf[n],
+                               min_t(int, epdrv->bufsize, strlen(&buf[n]) + 1));
+                        epdrv->buffer[epdrv->bufsize - 1] = '\0';
+                }
         }
 
         return 0;