Skip to content

Commit ec87da1

Browse files
lkundrakdtor
authored andcommitted
Input: olpc_apsp - assign priv->dev earlier
The dev field needs to be set when serio_register_port() is called, because the open callback may use it (in the error handling path). Fixes: commit af51834 ("Input: olpc_apsp - check FIFO status on open(), not probe()") Signed-off-by: Lubomir Rintel <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent d77651a commit ec87da1

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/input/serio/olpc_apsp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ static int olpc_apsp_probe(struct platform_device *pdev)
195195
if (!priv)
196196
return -ENOMEM;
197197

198+
priv->dev = &pdev->dev;
199+
198200
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
199201
priv->base = devm_ioremap_resource(&pdev->dev, res);
200202
if (IS_ERR(priv->base)) {
@@ -248,7 +250,6 @@ static int olpc_apsp_probe(struct platform_device *pdev)
248250
goto err_irq;
249251
}
250252

251-
priv->dev = &pdev->dev;
252253
device_init_wakeup(priv->dev, 1);
253254
platform_set_drvdata(pdev, priv);
254255

0 commit comments

Comments
 (0)