Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141229
b: refs/heads/master
c: f02d334
h: refs/heads/master
i:
  141227: a70a440
v: v3
  • Loading branch information
Andre Haupt authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 5656ba1 commit 291a635
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 370eb29dc441fb67a0175cc04134d13202b09c7d
refs/heads/master: f02d3345edcf0db86a98e229a4441c2b60b42f7e
6 changes: 3 additions & 3 deletions trunk/drivers/staging/me4000/me4000.c
Original file line number Diff line number Diff line change
Expand Up @@ -2205,7 +2205,7 @@ static int me4000_ao_ioctl_sing(struct inode *inode_p, struct file *file_p,
case ME4000_AO_SIMULTANEOUS_UPDATE:
return
me4000_ao_simultaneous_update(
(struct me4000_ao_channel_list *)arg,
(struct me4000_ao_channel_list *)arg,
ao_context);
case ME4000_AO_EX_TRIG_TIMEOUT:
return me4000_ao_ex_trig_timeout((unsigned long *)arg,
Expand Down Expand Up @@ -2681,11 +2681,11 @@ static int me4000_ao_preload_update(struct me4000_ao_context *ao_context)
(tmp &
(0x1 <<
(((struct me4000_ao_context *)entry)->index
+ 16)))) {
+ 16)))) {
tmp &=
~(0x1 <<
(((struct me4000_ao_context *)entry)->
index));
index));
}
}
}
Expand Down

0 comments on commit 291a635

Please sign in to comment.