diff --git a/[refs] b/[refs]
index 8a601dc8cd41..a22cd9e30c40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5f523bc0cdee2a163a034344ebf1163799b3c5d
+refs/heads/master: e74c2e81fc9e1e674f2747c85fe8cfeaaafa55f6
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 0ccfc30cd40f..9ee67b4b2b48 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -890,7 +890,7 @@ struct ff_periodic_effect {
 	struct ff_envelope envelope;
 
 	__u32 custom_len;
-	__s16 *custom_data;
+	__s16 __user *custom_data;
 };
 
 /**