diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /sound/oss/midibuf.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'sound/oss/midibuf.c')
| -rw-r--r-- | sound/oss/midibuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c index ceedb1eff20..8cdb2cfe65c 100644 --- a/sound/oss/midibuf.c +++ b/sound/oss/midibuf.c | |||
| @@ -295,7 +295,7 @@ int MIDIbuf_write(int dev, struct file *file, const char __user *buf, int count) | |||
| 295 | 295 | ||
| 296 | for (i = 0; i < n; i++) | 296 | for (i = 0; i < n; i++) |
| 297 | { | 297 | { |
| 298 | /* BROKE BROKE BROKE - CANT DO THIS WITH CLI !! */ | 298 | /* BROKE BROKE BROKE - CAN'T DO THIS WITH CLI !! */ |
| 299 | /* yes, think the same, so I removed the cli() brackets | 299 | /* yes, think the same, so I removed the cli() brackets |
| 300 | QUEUE_BYTE is protected against interrupts */ | 300 | QUEUE_BYTE is protected against interrupts */ |
| 301 | if (copy_from_user((char *) &tmp_data, &(buf)[c], 1)) { | 301 | if (copy_from_user((char *) &tmp_data, &(buf)[c], 1)) { |