Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 315226
b: refs/heads/master
c: 0ff1bd3
h: refs/heads/master
v: v3
  • Loading branch information
Richard A. Griffiths authored and Johannes Berg committed Jul 3, 2012
1 parent 15a2cae commit 33ea048
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: bd408b33363035275403cfaadf2683d8c8e22dd7
refs/heads/master: 0ff1bd35f5aece42879b04cbfe6b4040cf50a697
6 changes: 5 additions & 1 deletion trunk/drivers/net/wireless/iwlwifi/dvm/debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static ssize_t iwl_dbgfs_##name##_write(struct file *file, \
#define DEBUGFS_READ_FILE_OPS(name) \
DEBUGFS_READ_FUNC(name); \
static const struct file_operations iwl_dbgfs_##name##_ops = { \
.read = iwl_dbgfs_##name##_read, \
.read = iwl_dbgfs_##name##_read, \
.open = simple_open, \
.llseek = generic_file_llseek, \
};
Expand Down Expand Up @@ -2254,6 +2254,10 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
char buf[8];
int buf_size;

/* check that the interface is up */
if (!iwl_is_ready(priv))
return -EAGAIN;

memset(buf, 0, sizeof(buf));
buf_size = min(count, sizeof(buf) - 1);
if (copy_from_user(buf, user_buf, buf_size))
Expand Down

0 comments on commit 33ea048

Please sign in to comment.