summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2014-07-09 22:33:40 +0900
committerChanho Park <chanho61.park@samsung.com>2014-07-15 17:31:08 +0900
commit26393ee5829dd82ba49ccaa19175650e45aec9af (patch)
treeb1b6a364a9899cd5c7bb1d6660ba2539bcada8e3
parentb7c34a2cb4dce8c3f65359cfe9d4baa779f21415 (diff)
downloadlinux-3.10-26393ee5829dd82ba49ccaa19175650e45aec9af.tar.gz
linux-3.10-26393ee5829dd82ba49ccaa19175650e45aec9af.tar.bz2
linux-3.10-26393ee5829dd82ba49ccaa19175650e45aec9af.zip
Revert "dma-buf: return POLLIN | POLLOUT instead of POLLERR"
This reverts commit 09042c6296640228f3e725c1d3dbdcf0ce07ab6b.
-rw-r--r--drivers/base/dma-buf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/dma-buf.c b/drivers/base/dma-buf.c
index e2e35edf18c..53ade7b1652 100644
--- a/drivers/base/dma-buf.c
+++ b/drivers/base/dma-buf.c
@@ -113,11 +113,11 @@ static unsigned int dma_buf_poll(struct file *filp,
}
/*
- * There is no anyone accessing this buffer so just return.
+ * There is no anyone accessing this buffer so just return POLLERR.
*/
if (!robj->locked) {
mutex_unlock(&robj->lock);
- return POLLIN | POLLOUT;
+ return POLLERR;
}
poll_wait(filp, &robj->poll_wait, poll);