From b8f3d14806cf8544b739c85a27ed1c7685d728ee Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 4 May 2012 15:33:13 -0700 Subject: [PATCH] --- yaml --- r: 303771 b: refs/heads/master c: 65e78a2062d5e56f906d52c45820d08711d2c2e2 h: refs/heads/master i: 303769: add0933f516ceacc7958770fb4c24ed656504c81 303767: c5a744d5c8c357ebe49adba524980a2d5234cf1a v: v3 --- [refs] | 2 +- trunk/drivers/input/tablet/wacom_sys.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b9d25db9c175..d11fb41e96e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed2b2f2db2d52098bdda3877367d59984febdd9f +refs/heads/master: 65e78a2062d5e56f906d52c45820d08711d2c2e2 diff --git a/trunk/drivers/input/tablet/wacom_sys.c b/trunk/drivers/input/tablet/wacom_sys.c index ac29a68ac53e..79a0509882d4 100644 --- a/trunk/drivers/input/tablet/wacom_sys.c +++ b/trunk/drivers/input/tablet/wacom_sys.c @@ -99,7 +99,7 @@ static int wacom_set_report(struct usb_interface *intf, u8 type, u8 id, static void wacom_sys_irq(struct urb *urb) { struct wacom *wacom = urb->context; - struct device *dev = &wacom->wacom_wac.input->dev; + struct device *dev = &wacom->intf->dev; int retval; switch (urb->status) { @@ -820,7 +820,7 @@ static int wacom_initialize_leds(struct wacom *wacom) } if (error) { - dev_err(&wacom->wacom_wac.input->dev, + dev_err(&wacom->intf->dev, "cannot create sysfs group err: %d\n", error); return error; }