diff --git a/[refs] b/[refs] index 2a69d64a300f..a8b59199ef6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70c1e91f5b43327eca9941205c529ba43ddc7923 +refs/heads/master: 59691367be00806a3ab1c6a125ced6ed87e91356 diff --git a/trunk/drivers/staging/android/sync.c b/trunk/drivers/staging/android/sync.c index b9bb974faacd..bf66c199a833 100644 --- a/trunk/drivers/staging/android/sync.c +++ b/trunk/drivers/staging/android/sync.c @@ -261,7 +261,7 @@ static struct sync_fence *sync_fence_alloc(const char *name) fence->file = anon_inode_getfile("sync_fence", &sync_fence_fops, fence, 0); - if (fence->file == NULL) + if (IS_ERR(fence->file)) goto err; kref_init(&fence->kref);