Merge branch 'next' into for-linus

[sfrench/cifs-2.6.git] / drivers / input / mouse / hgpk.c

diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c
index a14a6b0f7af0232b228a87f89757399ded490331..a1ad2f1a7bb377c776368d55c2a05b5fcd7fd69b 100644 (file)
--- a/drivers/input/mouse/hgpk.c
+++ b/drivers/input/mouse/hgpk.c
@@ -381,7 +381,7 @@ static void hgpk_disconnect(struct psmouse *psmouse)
 
 static void hgpk_recalib_work(struct work_struct *work)
 {
-       struct delayed_work *w = container_of(work, struct delayed_work, work);
+       struct delayed_work *w = to_delayed_work(work);
        struct hgpk_data *priv = container_of(w, struct hgpk_data, recalib_wq);
        struct psmouse *psmouse = priv->psmouse;