diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 14:30:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 14:30:47 +1000 |
| commit | 5e3095d31b4888c6cfa738d941bb8c9a64ce515f (patch) | |
| tree | edf04b8ae3025dcc2792f5b8cb01cc4ddffcb6e6 /drivers/isdn/i4l/isdn_common.c | |
| parent | 1b287c0d989a1bf1ecfc8656eb1009e80e3abe0d (diff) | |
| parent | 96f0f03be3ad2bbdb44d6626ef6962400bd2febb (diff) | |
Merge commit 'trivial/for-next'
Diffstat (limited to 'drivers/isdn/i4l/isdn_common.c')
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 7188c59a76ff..adb1e8c36b46 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c @@ -761,7 +761,7 @@ isdn_getnum(char **p) * Be aware that this is not an atomic operation when sleep != 0, even though * interrupts are turned off! Well, like that we are currently only called * on behalf of a read system call on raw device files (which are documented - * to be dangerous and for for debugging purpose only). The inode semaphore + * to be dangerous and for debugging purpose only). The inode semaphore * takes care that this is not called for the same minor device number while * we are sleeping, but access is not serialized against simultaneous read() * from the corresponding ttyI device. Can other ugly events, like changes @@ -873,7 +873,7 @@ isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_que * Be aware that this is not an atomic operation when sleep != 0, even though * interrupts are turned off! Well, like that we are currently only called * on behalf of a read system call on raw device files (which are documented - * to be dangerous and for for debugging purpose only). The inode semaphore + * to be dangerous and for debugging purpose only). The inode semaphore * takes care that this is not called for the same minor device number while * we are sleeping, but access is not serialized against simultaneous read() * from the corresponding ttyI device. Can other ugly events, like changes |