diff options
| author | Colin Cross <ccross@android.com> | 2010-09-03 13:29:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 13:29:54 -0700 |
| commit | 49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19 (patch) | |
| tree | a1a6b48e7cfea2f774cbc9eed4fc787f8104d0a2 /init | |
| parent | 556f09c426084b62c34742ee0810fc97ae37abf7 (diff) | |
| parent | 17dcc5c57dcffb919f3de65ff7a0134ffa3bd874 (diff) | |
| download | system_core-49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19.zip system_core-49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19.tar.gz system_core-49b8124a1759cb8b27e0c21a1a5a54b8a81bdb19.tar.bz2 | |
am 17dcc5c5: Use makedev helper for device major and minor numbers
Merge commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874' into gingerbread-plus-aosp
* commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874':
Use makedev helper for device major and minor numbers
Diffstat (limited to 'init')
| -rw-r--r-- | init/devices.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/init/devices.c b/init/devices.c index 8e912de..d7aa3a6 100644 --- a/init/devices.c +++ b/init/devices.c @@ -181,11 +181,8 @@ static void make_device(const char *path, int block, int major, int minor) mode_t mode; dev_t dev; - if(major > 255 || minor > 255) - return; - mode = get_device_perm(path, &uid, &gid) | (block ? S_IFBLK : S_IFCHR); - dev = (major << 8) | minor; + dev = makedev(major, minor); /* Temporarily change egid to avoid race condition setting the gid of the * device node. Unforunately changing the euid would prevent creation of * some device nodes, so the uid has to be set with chown() and is still |