Merge tag 'v3.4-rc6' into gpio/next

Linux 3.4-rc6

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/char/tile-srom.c b/drivers/char/tile-srom.c
index 4dc019408fac..3b22a606f79d 100644
--- a/drivers/char/tile-srom.c
+++ b/drivers/char/tile-srom.c
@@ -194,17 +194,17 @@ static ssize_t srom_read(struct file *filp, char __user *buf,
 
                 hv_retval = _srom_read(srom->hv_devhdl, kernbuf,
                                        *f_pos, bytes_this_pass);
-                if (hv_retval > 0) {
-                        if (copy_to_user(buf, kernbuf, hv_retval) != 0) {
-                                retval = -EFAULT;
-                                break;
-                        }
-                } else if (hv_retval <= 0) {
+                if (hv_retval <= 0) {
                         if (retval == 0)
                                 retval = hv_retval;
                         break;
                 }
 
+                if (copy_to_user(buf, kernbuf, hv_retval) != 0) {
+                        retval = -EFAULT;
+                        break;
+                }
+
                 retval += hv_retval;
                 *f_pos += hv_retval;
                 buf += hv_retval;