diff --git a/[refs] b/[refs]
index 0efaa14da657..d85bdb2509c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b30d89d1055f9acd14b5eaf82d8f6a4763e91d85
+refs/heads/master: 2dcd9543a28da523a179a13b1eefa5f9b8e05d72
diff --git a/trunk/drivers/hid/hid-emsff.c b/trunk/drivers/hid/hid-emsff.c
index 81877c67caea..a5dc13fe367b 100644
--- a/trunk/drivers/hid/hid-emsff.c
+++ b/trunk/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: