From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 19 Jul 2011 08:14:04 +0000 (+0800)
Subject: HID: emsff: properly handle emsff_init failure
X-Git-Tag: firefly_0821_release~3680^2~5001^2^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2dcd9543a28da523a179a13b1eefa5f9b8e05d72;p=firefly-linux-kernel-4.4.55.git

HID: emsff: properly handle emsff_init failure

emsff_init() may fail, let's properly handle the failure.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/hid-emsff.c b/drivers/hid/hid-emsff.c
index 81877c67caea..a5dc13fe367b 100644
--- a/drivers/hid/hid-emsff.c
+++ b/drivers/hid/hid-emsff.c
@@ -126,7 +126,12 @@ static int ems_probe(struct hid_device *hdev, const struct hid_device_id *id)
 		goto err;
 	}
 
-	emsff_init(hdev);
+	ret = emsff_init(hdev);
+	if (ret) {
+		dev_err(&hdev->dev, "force feedback init failed\n");
+		hid_hw_stop(hdev);
+		goto err;
+	}
 
 	return 0;
 err: