diff options
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/longhaul.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/alloc.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/file.c | 2 | ||||
-rw-r--r-- | net/ipv6/route.c | 2 | ||||
-rw-r--r-- | net/ipv6/sysctl_net_ipv6.c | 2 | ||||
-rw-r--r-- | net/sched/sch_sfq.c | 2 | ||||
-rw-r--r-- | security/smack/smackfs.c | 2 | ||||
-rw-r--r-- | sound/soc/au1x/dbdma2.c | 2 | ||||
-rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/longhaul.c b/arch/x86/kernel/cpu/cpufreq/longhaul.c index b0461856acfb..a4cff5d6e380 100644 --- a/arch/x86/kernel/cpu/cpufreq/longhaul.c +++ b/arch/x86/kernel/cpu/cpufreq/longhaul.c | |||
@@ -982,7 +982,7 @@ static int __init longhaul_init(void) | |||
982 | case 10: | 982 | case 10: |
983 | printk(KERN_ERR PFX "Use acpi-cpufreq driver for VIA C7\n"); | 983 | printk(KERN_ERR PFX "Use acpi-cpufreq driver for VIA C7\n"); |
984 | default: | 984 | default: |
985 | ;; | 985 | ; |
986 | } | 986 | } |
987 | 987 | ||
988 | return -ENODEV; | 988 | return -ENODEV; |
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 54ff4c77aaa3..d861096c9d81 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
@@ -3868,7 +3868,7 @@ static void ocfs2_split_record(struct inode *inode, | |||
3868 | struct ocfs2_extent_list *left_el = NULL, *right_el, *insert_el, *el; | 3868 | struct ocfs2_extent_list *left_el = NULL, *right_el, *insert_el, *el; |
3869 | struct ocfs2_extent_rec *rec, *tmprec; | 3869 | struct ocfs2_extent_rec *rec, *tmprec; |
3870 | 3870 | ||
3871 | right_el = path_leaf_el(right_path);; | 3871 | right_el = path_leaf_el(right_path); |
3872 | if (left_path) | 3872 | if (left_path) |
3873 | left_el = path_leaf_el(left_path); | 3873 | left_el = path_leaf_el(left_path); |
3874 | 3874 | ||
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index e8f795f978aa..a5887df2cd8a 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -1605,7 +1605,7 @@ int ocfs2_change_file_space(struct file *file, unsigned int cmd, | |||
1605 | struct ocfs2_space_resv *sr) | 1605 | struct ocfs2_space_resv *sr) |
1606 | { | 1606 | { |
1607 | struct inode *inode = file->f_path.dentry->d_inode; | 1607 | struct inode *inode = file->f_path.dentry->d_inode; |
1608 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);; | 1608 | struct ocfs2_super *osb = OCFS2_SB(inode->i_sb); |
1609 | 1609 | ||
1610 | if ((cmd == OCFS2_IOC_RESVSP || cmd == OCFS2_IOC_RESVSP64) && | 1610 | if ((cmd == OCFS2_IOC_RESVSP || cmd == OCFS2_IOC_RESVSP64) && |
1611 | !ocfs2_writes_unwritten_extents(osb)) | 1611 | !ocfs2_writes_unwritten_extents(osb)) |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 76f06b94ab9f..c4a59824ac2c 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -2752,7 +2752,7 @@ int __init ip6_route_init(void) | |||
2752 | kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0, | 2752 | kmem_cache_create("ip6_dst_cache", sizeof(struct rt6_info), 0, |
2753 | SLAB_HWCACHE_ALIGN, NULL); | 2753 | SLAB_HWCACHE_ALIGN, NULL); |
2754 | if (!ip6_dst_ops_template.kmem_cachep) | 2754 | if (!ip6_dst_ops_template.kmem_cachep) |
2755 | goto out;; | 2755 | goto out; |
2756 | 2756 | ||
2757 | ret = register_pernet_subsys(&ip6_route_net_ops); | 2757 | ret = register_pernet_subsys(&ip6_route_net_ops); |
2758 | if (ret) | 2758 | if (ret) |
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c index 9048fe7e7ea7..a031034720b4 100644 --- a/net/ipv6/sysctl_net_ipv6.c +++ b/net/ipv6/sysctl_net_ipv6.c | |||
@@ -128,7 +128,7 @@ static struct ctl_table_header *ip6_header; | |||
128 | 128 | ||
129 | int ipv6_sysctl_register(void) | 129 | int ipv6_sysctl_register(void) |
130 | { | 130 | { |
131 | int err = -ENOMEM;; | 131 | int err = -ENOMEM; |
132 | 132 | ||
133 | ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_table); | 133 | ip6_header = register_net_sysctl_rotable(net_ipv6_ctl_path, ipv6_table); |
134 | if (ip6_header == NULL) | 134 | if (ip6_header == NULL) |
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index f3965df00559..33133d27b539 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
@@ -435,7 +435,7 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt) | |||
435 | int i; | 435 | int i; |
436 | 436 | ||
437 | q->perturb_timer.function = sfq_perturbation; | 437 | q->perturb_timer.function = sfq_perturbation; |
438 | q->perturb_timer.data = (unsigned long)sch;; | 438 | q->perturb_timer.data = (unsigned long)sch; |
439 | init_timer_deferrable(&q->perturb_timer); | 439 | init_timer_deferrable(&q->perturb_timer); |
440 | 440 | ||
441 | for (i = 0; i < SFQ_HASH_DIVISOR; i++) | 441 | for (i = 0; i < SFQ_HASH_DIVISOR; i++) |
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index bf107a389ac1..71e2b914363e 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c | |||
@@ -569,7 +569,7 @@ static ssize_t smk_write_cipso(struct file *file, const char __user *buf, | |||
569 | if (skp == NULL) | 569 | if (skp == NULL) |
570 | goto out; | 570 | goto out; |
571 | 571 | ||
572 | rule += SMK_LABELLEN;; | 572 | rule += SMK_LABELLEN; |
573 | ret = sscanf(rule, "%d", &maplevel); | 573 | ret = sscanf(rule, "%d", &maplevel); |
574 | if (ret != 1 || maplevel > SMACK_CIPSO_MAXLEVEL) | 574 | if (ret != 1 || maplevel > SMACK_CIPSO_MAXLEVEL) |
575 | goto out; | 575 | goto out; |
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 74c823d60f91..bc8d654576c0 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c | |||
@@ -187,7 +187,7 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd, | |||
187 | au1x_pcm_dmatx_cb, (void *)pcd); | 187 | au1x_pcm_dmatx_cb, (void *)pcd); |
188 | 188 | ||
189 | if (!pcd->ddma_chan) | 189 | if (!pcd->ddma_chan) |
190 | return -ENOMEM;; | 190 | return -ENOMEM; |
191 | 191 | ||
192 | au1xxx_dbdma_set_devwidth(pcd->ddma_chan, msbits); | 192 | au1xxx_dbdma_set_devwidth(pcd->ddma_chan, msbits); |
193 | au1xxx_dbdma_ring_alloc(pcd->ddma_chan, 2); | 193 | au1xxx_dbdma_ring_alloc(pcd->ddma_chan, 2); |
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 74abc9b4f1cc..366049d8578c 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c | |||
@@ -212,7 +212,7 @@ davinci_pcm_pointer(struct snd_pcm_substream *substream) | |||
212 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | 212 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) |
213 | count = src - runtime->dma_addr; | 213 | count = src - runtime->dma_addr; |
214 | else | 214 | else |
215 | count = dst - runtime->dma_addr;; | 215 | count = dst - runtime->dma_addr; |
216 | 216 | ||
217 | spin_unlock(&prtd->lock); | 217 | spin_unlock(&prtd->lock); |
218 | 218 | ||