scm: lower SCM_MAX_FD

[net-next-2.6.git] / kernel / pm_qos_params.c

diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index 645e541a45f6c9a9667c054bd7f5230ecaef67a3..c7a8f453919e65a42e0251b968a2d3652e0a4c3a 100644 (file)
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -110,6 +110,7 @@ static const struct file_operations pm_qos_power_fops = {
        .write = pm_qos_power_write,
        .open = pm_qos_power_open,
        .release = pm_qos_power_release,
+       .llseek = noop_llseek,
 };
 
 /* unlocked internal variant */
@@ -398,7 +399,7 @@ static ssize_t pm_qos_power_write(struct file *filp, const char __user *buf,
        } else
                return -EINVAL;
 
-       pm_qos_req = (struct pm_qos_request_list *)filp->private_data;
+       pm_qos_req = filp->private_data;
        pm_qos_update_request(pm_qos_req, value);
 
        return count;