diff --git a/[refs] b/[refs]
index dd93a0ee682b..a385c9bb3196 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec400c9fab99d16a491cea17d27d0c6a5780b97c
+refs/heads/master: e58a0f89b25a2299374176d5c37aa89b326681e6
diff --git a/trunk/drivers/misc/fsa9480.c b/trunk/drivers/misc/fsa9480.c
index 27dc0d21aafa..f6586d53e1a3 100644
--- a/trunk/drivers/misc/fsa9480.c
+++ b/trunk/drivers/misc/fsa9480.c
@@ -400,7 +400,8 @@ static int fsa9480_irq_init(struct fsa9480_usbsw *usbsw)
 			return ret;
 		}
 
-		device_init_wakeup(&client->dev, pdata->wakeup);
+		if (pdata)
+			device_init_wakeup(&client->dev, pdata->wakeup);
 	}
 
 	return 0;