Merge 3.5-rc7 into char-misc-next.

[~andy/linux] / drivers / misc / mei / main.c

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 783fcd7365bc1e770739db884bba4a5088479e22..0d98c2ee6fe3afac8eb8629c3ed6a352630d11b1 100644 (file)
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -714,13 +714,8 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
        if (rets && dev->mei_host_buffer_is_empty) {
                rets = 0;
                dev->mei_host_buffer_is_empty = false;
-               if (length > ((((dev->host_hw_state & H_CBD) >> 24) *
-                       sizeof(u32)) - sizeof(struct mei_msg_hdr))) {
-
-                       mei_hdr.length =
-                               (((dev->host_hw_state & H_CBD) >> 24) *
-                               sizeof(u32)) -
-                               sizeof(struct mei_msg_hdr);
+               if (length >  mei_hbuf_max_data(dev)) {
+                       mei_hdr.length = mei_hbuf_max_data(dev);
                        mei_hdr.msg_complete = 0;
                } else {
                        mei_hdr.length = length;