diff --git a/[refs] b/[refs] index 9b1873a17c21..a64cc8d2e2e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 670dd90d81f60ef429cbba54ad235e9207f4d444 +refs/heads/master: e391553222211e07dfbe2f01c413b4e6d0ae32aa diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c index f8071976fe07..2b8755db76c6 100644 --- a/trunk/drivers/base/platform.c +++ b/trunk/drivers/base/platform.c @@ -275,7 +275,7 @@ int platform_device_add(struct platform_device *pdev) pr_debug("Registering platform device '%s'. Parent at %s\n", pdev->dev.bus_id, pdev->dev.parent->bus_id); - ret = device_register(&pdev->dev); + ret = device_add(&pdev->dev); if (ret == 0) return ret;