Merge tag 'hwmon-for-v7.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[linux.git] / drivers / input / joystick / maplecontrol.c

diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index 7f36f73844a910691df9e1ea57bc79e42c80524e..6293b6e8148b34e19e4542a74b25f80a2fdd29aa 100644 (file)
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -112,6 +112,8 @@ static int probe_maple_controller(struct device *dev)
        pad->dev = idev;
        pad->mdev = mdev;
 
+       maple_set_drvdata(mdev, pad);
+
        idev->open = dc_pad_open;
        idev->close = dc_pad_close;
 
@@ -146,7 +148,6 @@ static int probe_maple_controller(struct device *dev)
                goto fail;
 
        mdev->driver = mdrv;
-       maple_set_drvdata(mdev, pad);
 
        return 0;