diff options
| -rw-r--r-- | drivers/misc/mediatek/gpio/mt6735/mt_gpio_debug.c | 8 | ||||
| -rw-r--r-- | fs/ecryptfs/kthread.c | 13 | ||||
| -rw-r--r-- | kernel/sched/rt.c | 2 | ||||
| -rw-r--r-- | lib/asn1_decoder.c | 5 | ||||
| -rw-r--r-- | net/core/ethtool.c | 4 |
5 files changed, 12 insertions, 20 deletions
diff --git a/drivers/misc/mediatek/gpio/mt6735/mt_gpio_debug.c b/drivers/misc/mediatek/gpio/mt6735/mt_gpio_debug.c index 11bbead81..dc150054a 100644 --- a/drivers/misc/mediatek/gpio/mt6735/mt_gpio_debug.c +++ b/drivers/misc/mediatek/gpio/mt6735/mt_gpio_debug.c @@ -704,7 +704,7 @@ ssize_t mt_gpio_store_pin(struct device* dev, struct device_attribute *attr, #endif int mode, pullsel, dout, pullen, dir, ies, smt; u32 num,src,div; - char md_str[128]="GPIO_MD_TEST"; + //char md_str[128]="GPIO_MD_TEST"; //struct mt_gpio_obj *obj = (struct mt_gpio_obj*)dev_get_drvdata(dev); if (!strncmp(buf, "-h", 2)) { GPIOMSG("cat pin #show all pin setting\n"); @@ -797,9 +797,9 @@ ssize_t mt_gpio_store_pin(struct device* dev, struct device_attribute *attr, //GPIOMSG("gpio reg test for next chip!\n"); //mt_reg_test(); } else if (!strncmp(buf, "-md", 3)) { - buf +=3; - sscanf(buf,"%s",md_str); - mt_get_md_gpio_debug(md_str); + //buf +=3; + //sscanf(buf,"%s",md_str); + //mt_get_md_gpio_debug(md_str); } else if (!strncmp(buf, "-k", 2)) { buf += 2; if (!strncmp(buf, "s", 1) && (3 == sscanf(buf+1, "%d %d %d", &num, &src, &div))) diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c index 9b661a4cc..f1ea61036 100644 --- a/fs/ecryptfs/kthread.c +++ b/fs/ecryptfs/kthread.c @@ -25,7 +25,6 @@ #include <linux/slab.h> #include <linux/wait.h> #include <linux/mount.h> -#include <linux/file.h> #include "ecryptfs_kernel.h" struct ecryptfs_open_req { @@ -148,7 +147,7 @@ int ecryptfs_privileged_open(struct file **lower_file, flags |= IS_RDONLY(lower_dentry->d_inode) ? O_RDONLY : O_RDWR; (*lower_file) = dentry_open(&req.path, flags, cred); if (!IS_ERR(*lower_file)) - goto have_file; + goto out; if ((flags & O_ACCMODE) == O_RDONLY) { rc = PTR_ERR((*lower_file)); goto out; @@ -166,16 +165,8 @@ int ecryptfs_privileged_open(struct file **lower_file, mutex_unlock(&ecryptfs_kthread_ctl.mux); wake_up(&ecryptfs_kthread_ctl.wait); wait_for_completion(&req.done); - if (IS_ERR(*lower_file)) { + if (IS_ERR(*lower_file)) rc = PTR_ERR(*lower_file); - goto out; - } -have_file: - if ((*lower_file)->f_op->mmap == NULL) { - fput(*lower_file); - *lower_file = NULL; - rc = -EMEDIUMTYPE; - } out: return rc; } diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 692fb1e77..049bb3eb7 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -551,7 +551,7 @@ void unthrottle_offline_rt_rqs(struct rq *rq) { */ if (rt_rq_throttled(rt_rq)){ rt_rq->rt_throttled = 0; - printk_deferred("sched: RT throttling inactivated\n"); + printk_deferred("sched: RT throttling inactivated cpu\n"); } } } diff --git a/lib/asn1_decoder.c b/lib/asn1_decoder.c index 2937ba5e5..a6b531906 100644 --- a/lib/asn1_decoder.c +++ b/lib/asn1_decoder.c @@ -210,9 +210,8 @@ next_op: unsigned char tmp; /* Skip conditional matches if possible */ - if ((op & ASN1_OP_MATCH__COND && - flags & FLAG_MATCHED) || - dp == datalen) { + if ((op & ASN1_OP_MATCH__COND && flags & FLAG_MATCHED) || + (op & ASN1_OP_MATCH__SKIP && dp == datalen)) { pc += asn1_op_lengths[op]; goto next_op; } diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 213b61255..4ab21a688 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -711,11 +711,13 @@ static int ethtool_reset(struct net_device *dev, char __user *useraddr) static int ethtool_get_wol(struct net_device *dev, char __user *useraddr) { - struct ethtool_wolinfo wol = { .cmd = ETHTOOL_GWOL }; + struct ethtool_wolinfo wol; if (!dev->ethtool_ops->get_wol) return -EOPNOTSUPP; + memset(&wol, 0, sizeof(struct ethtool_wolinfo)); + wol.cmd = ETHTOOL_GWOL; dev->ethtool_ops->get_wol(dev, &wol); if (copy_to_user(useraddr, &wol, sizeof(wol))) |