linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / sbus / char / openprom.c

diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
index 239e108..383a95f 100644 (file)
--- a/drivers/sbus/char/openprom.c
+++ b/drivers/sbus/char/openprom.c
@@ -392,16 +392,13 @@ static int openprom_bsd_ioctl(struct inode * inode, struct file * file,
                        return -ENOMEM;
                }
 
-               cnt = prom_getproperty(op.op_nodeid, str, tmp, len);
-               if (cnt <= 0) {
-                       error = -EINVAL;
-               } else {
-                       tmp[len] = '\0';
+               prom_getproperty(op.op_nodeid, str, tmp, len);
 
-                       if (__copy_to_user(argp, &op, sizeof(op)) != 0 ||
-                           copy_to_user(op.op_buf, tmp, len) != 0)
-                               error = -EFAULT;
-               }
+               tmp[len] = '\0';
+
+               if (__copy_to_user(argp, &op, sizeof(op)) != 0
+                   || copy_to_user(op.op_buf, tmp, len) != 0)
+                       error = -EFAULT;
 
                kfree(tmp);
                kfree(str);