diff --git a/[refs] b/[refs]
index 4f15dec28b4b..e5fe34fe95e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd401204873101245287afc07271b39c79194d9c
+refs/heads/master: 79f34d19d7d1ece9918afe079529e61f978eeebe
diff --git a/trunk/drivers/input/misc/bma150.c b/trunk/drivers/input/misc/bma150.c
index 08ffcabd7220..e5d18946bb2e 100644
--- a/trunk/drivers/input/misc/bma150.c
+++ b/trunk/drivers/input/misc/bma150.c
@@ -372,7 +372,7 @@ static int bma150_open(struct bma150_data *bma150)
 	int error;
 
 	error = pm_runtime_get_sync(&bma150->client->dev);
-	if (error && error != -ENOSYS)
+	if (error < 0 && error != -ENOSYS)
 		return error;
 
 	/*