| Message ID | 1460722549-31804-1-git-send-email-ckeepax@opensource.wolfsonmicro.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Apr 15, 2016 at 01:15:49PM +0100, Charles Keepax wrote: > We shouldn't assign the parent device of the input_dev to be the > parent MFD device, because this will be used for devres which causes > input_unregister_device to run after the haptics device has been > removed, since it is itself a child of the MFD device. The default > of using the haptics device itself as the parent is correct. > > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Applied, thank you. > --- > drivers/input/misc/arizona-haptics.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c > index d5994a7..9829363 100644 > --- a/drivers/input/misc/arizona-haptics.c > +++ b/drivers/input/misc/arizona-haptics.c > @@ -178,7 +178,6 @@ static int arizona_haptics_probe(struct platform_device *pdev) > input_set_drvdata(haptics->input_dev, haptics); > > haptics->input_dev->name = "arizona:haptics"; > - haptics->input_dev->dev.parent = pdev->dev.parent; > haptics->input_dev->close = arizona_haptics_close; > __set_bit(FF_RUMBLE, haptics->input_dev->ffbit); > > -- > 2.1.4 >
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c index d5994a7..9829363 100644 --- a/drivers/input/misc/arizona-haptics.c +++ b/drivers/input/misc/arizona-haptics.c @@ -178,7 +178,6 @@ static int arizona_haptics_probe(struct platform_device *pdev) input_set_drvdata(haptics->input_dev, haptics); haptics->input_dev->name = "arizona:haptics"; - haptics->input_dev->dev.parent = pdev->dev.parent; haptics->input_dev->close = arizona_haptics_close; __set_bit(FF_RUMBLE, haptics->input_dev->ffbit);
We shouldn't assign the parent device of the input_dev to be the parent MFD device, because this will be used for devres which causes input_unregister_device to run after the haptics device has been removed, since it is itself a child of the MFD device. The default of using the haptics device itself as the parent is correct. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> --- drivers/input/misc/arizona-haptics.c | 1 - 1 file changed, 1 deletion(-)