Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm...

[~andy/linux] / drivers / hid / hid-axff.c

diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c
index b4554288de00bee40adb14d3318df8d4aa3c97b8..121514149e0b4fd5f5332b8dee252436b8c784f7 100644 (file)
--- a/drivers/hid/hid-axff.c
+++ b/drivers/hid/hid-axff.c
@@ -154,6 +154,7 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)
        error = hid_hw_open(hdev);
        if (error) {
                dev_err(&hdev->dev, "hw open failed\n");
+               hid_hw_stop(hdev);
                return error;
        }