From eda9cd0ff86f164a70986e573e89438675229b50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= Date: Sun, 19 Aug 2012 19:33:56 +0200 Subject: [PATCH] --- yaml --- r: 323451 b: refs/heads/master c: eb9001cd8ffff9c9b1ed1ea85d36c862bea964c0 h: refs/heads/master i: 323449: 01d6bfe9121050df8700748b3135b7c6a5588a48 323447: a9f22e0cab7a4004f10fadffa84722ac4a424d85 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-picolcd_core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bbe9baa42461..cbd56a021ceb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2df5b78394faaaaa6989396495b297756974469 +refs/heads/master: eb9001cd8ffff9c9b1ed1ea85d36c862bea964c0 diff --git a/trunk/drivers/hid/hid-picolcd_core.c b/trunk/drivers/hid/hid-picolcd_core.c index 0d0c798e3eed..8c9ec1facdb4 100644 --- a/trunk/drivers/hid/hid-picolcd_core.c +++ b/trunk/drivers/hid/hid-picolcd_core.c @@ -446,7 +446,7 @@ static int picolcd_init_keys(struct picolcd_data *data, idev->id.vendor = hdev->vendor; idev->id.product = hdev->product; idev->id.version = hdev->version; - idev->dev.parent = hdev->dev.parent; + idev->dev.parent = &hdev->dev; idev->keycode = &data->keycode; idev->keycodemax = PICOLCD_KEYS; idev->keycodesize = sizeof(data->keycode[0]);