aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/kprobes.txt3
-rw-r--r--arch/mips/kernel/vpe.c3
-rw-r--r--drivers/media/dvb/frontends/mt312.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/kprobes.txt b/Documentation/kprobes.txt
index 0541fe1de704..0ea5a0c6e827 100644
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
@@ -411,7 +411,8 @@ int init_module(void)
411 printk("Couldn't find %s to plant kprobe\n", "do_fork"); 411 printk("Couldn't find %s to plant kprobe\n", "do_fork");
412 return -1; 412 return -1;
413 } 413 }
414 if ((ret = register_kprobe(&kp) < 0)) { 414 ret = register_kprobe(&kp);
415 if (ret < 0) {
415 printk("register_kprobe failed, returned %d\n", ret); 416 printk("register_kprobe failed, returned %d\n", ret);
416 return -1; 417 return -1;
417 } 418 }
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 06be405be399..9c89eebc356f 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1171,7 +1171,8 @@ static int __init vpe_module_init(void)
1171 return -ENODEV; 1171 return -ENODEV;
1172 } 1172 }
1173 1173
1174 if ((major = register_chrdev(0, module_name, &vpe_fops) < 0)) { 1174 major = register_chrdev(0, module_name, &vpe_fops);
1175 if (major < 0) {
1175 printk("VPE loader: unable to register character device\n"); 1176 printk("VPE loader: unable to register character device\n");
1176 return major; 1177 return major;
1177 } 1178 }
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 8d672283c93d..ec4e641acc64 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -501,7 +501,8 @@ static int mt312_set_frontend(struct dvb_frontend* fe,
501 case ID_VP310: 501 case ID_VP310:
502 // For now we will do this only for the VP310. 502 // For now we will do this only for the VP310.
503 // It should be better for the mt312 as well, but tunning will be slower. ACCJr 09/29/03 503 // It should be better for the mt312 as well, but tunning will be slower. ACCJr 09/29/03
504 if ((ret = mt312_readreg(state, CONFIG, &config_val) < 0)) 504 ret = mt312_readreg(state, CONFIG, &config_val);
505 if (ret < 0)
505 return ret; 506 return ret;
506 if (p->u.qpsk.symbol_rate >= 30000000) //Note that 30MS/s should use 90MHz 507 if (p->u.qpsk.symbol_rate >= 30000000) //Note that 30MS/s should use 90MHz
507 { 508 {