mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Driver core fixes for 4.1-rc7
Here are 2 fixes for the driver core that resolve some reported issues, one is a regression from 4.0, the other a fixes a reported oops that has been there since 3.19. Both have been in linux-next for a while with no problems. Signed-off-by: Greg Kroah-Hartman <[email protected]> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlVzguAACgkQMUfUDdst+yltoQCgokCbKeHXhGu+31KjYboiXkhk 5ikAnRZKyFI8HKr+B9inecb/cMD0jhvR =uVNu -----END PGP SIGNATURE----- Merge tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core fixes from Greg KH: "Here are two fixes for the driver core that resolve some reported issues. One is a regression from 4.0, the other a fixes a reported oops that has been there since 3.19. Both have been in linux-next for a while with no problems" * tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: drivers/base: cacheinfo: handle absence of caches drivers: of/base: move of_init to driver_init
This commit is contained in:
commit
37ef1647b7
4 changed files with 12 additions and 6 deletions
|
|
@ -189,7 +189,7 @@ int __of_attach_node_sysfs(struct device_node *np)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __init of_init(void)
|
||||
void __init of_core_init(void)
|
||||
{
|
||||
struct device_node *np;
|
||||
|
||||
|
|
@ -198,7 +198,8 @@ static int __init of_init(void)
|
|||
of_kset = kset_create_and_add("devicetree", NULL, firmware_kobj);
|
||||
if (!of_kset) {
|
||||
mutex_unlock(&of_mutex);
|
||||
return -ENOMEM;
|
||||
pr_err("devicetree: failed to register existing nodes\n");
|
||||
return;
|
||||
}
|
||||
for_each_of_allnodes(np)
|
||||
__of_attach_node_sysfs(np);
|
||||
|
|
@ -207,10 +208,7 @@ static int __init of_init(void)
|
|||
/* Symlink in /proc as required by userspace ABI */
|
||||
if (of_root)
|
||||
proc_symlink("device-tree", NULL, "/sys/firmware/devicetree/base");
|
||||
|
||||
return 0;
|
||||
}
|
||||
core_initcall(of_init);
|
||||
|
||||
static struct property *__of_find_property(const struct device_node *np,
|
||||
const char *name, int *lenp)
|
||||
|
|
|
|||
Loading…
Reference in a new issue