diff --git a/[refs] b/[refs]
index 6a71f8e2afdb..4454c7e6144c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efce8a412161b0555254bd6ac1dcdfb7886bfd8c
+refs/heads/master: cdbe8a86379b9002598a4d14791dc8e790b1f5f5
diff --git a/trunk/drivers/input/keyboard/tca8418_keypad.c b/trunk/drivers/input/keyboard/tca8418_keypad.c
index 3bb981af8ac4..ab41a2ea3055 100644
--- a/trunk/drivers/input/keyboard/tca8418_keypad.c
+++ b/trunk/drivers/input/keyboard/tca8418_keypad.c
@@ -283,7 +283,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
 {
 	struct device *dev = &client->dev;
 	const struct tca8418_keypad_platform_data *pdata =
-						client->dev.platform_data;
+						dev_get_platdata(dev);
 	struct tca8418_keypad *keypad_data;
 	struct input_dev *input;
 	const struct matrix_keymap_data *keymap_data = NULL;