extcon: palmas: explicitly set edev name as node name
commit ca488 (extcon: of: Remove unnecessary function call by using the name of device_node) started using node name instead of device name to get the extcon device. This breaks dwc3-omap since it's not able to get the extcon device anymore. Fixed it by setting edev name of palmas to be the same as its node name. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Reported-by: Felipe Balbi <balbi@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
This commit is contained in:
Родитель
a798c10faf
Коммит
f63d32d408
|
@ -23,6 +23,7 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/mfd/palmas.h>
|
#include <linux/mfd/palmas.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
@ -188,11 +189,13 @@ static int palmas_usb_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
palmas_usb->edev.supported_cable = palmas_extcon_cable;
|
palmas_usb->edev.supported_cable = palmas_extcon_cable;
|
||||||
palmas_usb->edev.dev.parent = palmas_usb->dev;
|
palmas_usb->edev.dev.parent = palmas_usb->dev;
|
||||||
|
palmas_usb->edev.name = kstrdup(node->name, GFP_KERNEL);
|
||||||
palmas_usb->edev.mutually_exclusive = mutually_exclusive;
|
palmas_usb->edev.mutually_exclusive = mutually_exclusive;
|
||||||
|
|
||||||
status = extcon_dev_register(&palmas_usb->edev);
|
status = extcon_dev_register(&palmas_usb->edev);
|
||||||
if (status) {
|
if (status) {
|
||||||
dev_err(&pdev->dev, "failed to register extcon device\n");
|
dev_err(&pdev->dev, "failed to register extcon device\n");
|
||||||
|
kfree(palmas_usb->edev.name);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,6 +233,7 @@ static int palmas_usb_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
fail_extcon:
|
fail_extcon:
|
||||||
extcon_dev_unregister(&palmas_usb->edev);
|
extcon_dev_unregister(&palmas_usb->edev);
|
||||||
|
kfree(palmas_usb->edev.name);
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
@ -239,6 +243,7 @@ static int palmas_usb_remove(struct platform_device *pdev)
|
||||||
struct palmas_usb *palmas_usb = platform_get_drvdata(pdev);
|
struct palmas_usb *palmas_usb = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
extcon_dev_unregister(&palmas_usb->edev);
|
extcon_dev_unregister(&palmas_usb->edev);
|
||||||
|
kfree(palmas_usb->edev.name);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче