diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:35:18 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-09 16:35:18 -0400 |
| commit | fd2841c5b59c276796f730b77ef37408c0909f9c (patch) | |
| tree | 34329300850e4addad576325840b6715e6894a9a /drivers/net/wireless/iwlwifi/dvm/debugfs.c | |
| parent | Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next (diff) | |
| parent | iwlwifi: disallow log_event access if interface down (diff) | |
| download | linux-dev-fd2841c5b59c276796f730b77ef37408c0909f9c.tar.xz linux-dev-fd2841c5b59c276796f730b77ef37408c0909f9c.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/debugfs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/debugfs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c index b0eff1c340c7..46782f1102ac 100644 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c @@ -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, \ }; @@ -2255,6 +2255,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)) |