summaryrefslogtreecommitdiff
path: root/drivers/input/serio
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2020-10-19 04:42:32 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2020-10-19 04:42:32 +0300
commitbb0bc0cfeabc0d6865865e8d3a601bea6711f951 (patch)
treef5321f28b6ea9c557316980226c6139a45a3aec9 /drivers/input/serio
parent5fc27b098dafb8e30794a9db0705074c7d766179 (diff)
parent8a30c6eb29e036f729b4dd6982462ca15d062087 (diff)
downloadlinux-bb0bc0cfeabc0d6865865e8d3a601bea6711f951.tar.xz
Merge branch 'next' into for-linus
Prepare input updates for 5.10 merge window.
Diffstat (limited to 'drivers/input/serio')
-rw-r--r--drivers/input/serio/sun4i-ps2.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/input/serio/sun4i-ps2.c b/drivers/input/serio/sun4i-ps2.c
index a681a2c04e39..f15ed3dcdb9b 100644
--- a/drivers/input/serio/sun4i-ps2.c
+++ b/drivers/input/serio/sun4i-ps2.c
@@ -211,7 +211,6 @@ static int sun4i_ps2_probe(struct platform_device *pdev)
struct sun4i_ps2data *drvdata;
struct serio *serio;
struct device *dev = &pdev->dev;
- unsigned int irq;
int error;
drvdata = kzalloc(sizeof(struct sun4i_ps2data), GFP_KERNEL);
@@ -264,14 +263,12 @@ static int sun4i_ps2_probe(struct platform_device *pdev)
writel(0, drvdata->reg_base + PS2_REG_GCTL);
/* Get IRQ for the device */
- irq = platform_get_irq(pdev, 0);
- if (!irq) {
- dev_err(dev, "no IRQ found\n");
- error = -ENXIO;
+ drvdata->irq = platform_get_irq(pdev, 0);
+ if (drvdata->irq < 0) {
+ error = drvdata->irq;
goto err_disable_clk;
}
- drvdata->irq = irq;
drvdata->serio = serio;
drvdata->dev = dev;