summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChanho Park <chanho61.park@samsung.com>2014-08-19 21:39:46 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-21 19:12:20 +0900
commit4938e4c31816bf043efb943cc2817d8fab1351c9 (patch)
tree70178bcce2c6d12c60f8fec8b411740b966e346f
parent80ce1d4b77d71a101f252ac24c5a6682cb74c15f (diff)
downloadlinux-3.10-4938e4c31816bf043efb943cc2817d8fab1351c9.tar.gz
linux-3.10-4938e4c31816bf043efb943cc2817d8fab1351c9.tar.bz2
linux-3.10-4938e4c31816bf043efb943cc2817d8fab1351c9.zip
Revert "dma-buf: return POLLIN | POLLOUT instead of POLLERR"
This reverts commit 494805a828f760a3b36629875cc123cc1e396aa8.
-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 b5d796076ce..fa42c56b30d 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);