diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-25 13:11:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-25 13:11:52 +0200 |
| commit | 346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8 (patch) | |
| tree | 0e824d68b72969127abcad85e82b468ed4e23237 /drivers/infiniband/hw/qib/qib_debugfs.c | |
| parent | Merge tag 'usb-serial-3.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next (diff) | |
| parent | phy: remove .owner field for drivers using module_platform_driver (diff) | |
| download | linux-dev-346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8.tar.xz linux-dev-346e2e4a8b47089f4319f114ec9ac3a95b5f0ac8.zip | |
Merge tag 'phy-for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
Adds 3 new PHY drivers stih407, stih41x and rcar gen2 PHY. It also
includes miscellaneous cleanup of other PHY drivers.
Conflicts:
MAINTAINERS
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_debugfs.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_debugfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_debugfs.c b/drivers/infiniband/hw/qib/qib_debugfs.c index 799a0c3bffc4..6abd3ed3cd51 100644 --- a/drivers/infiniband/hw/qib/qib_debugfs.c +++ b/drivers/infiniband/hw/qib/qib_debugfs.c @@ -193,6 +193,7 @@ static void *_qp_stats_seq_start(struct seq_file *s, loff_t *pos) struct qib_qp_iter *iter; loff_t n = *pos; + rcu_read_lock(); iter = qib_qp_iter_init(s->private); if (!iter) return NULL; @@ -224,7 +225,7 @@ static void *_qp_stats_seq_next(struct seq_file *s, void *iter_ptr, static void _qp_stats_seq_stop(struct seq_file *s, void *iter_ptr) { - /* nothing for now */ + rcu_read_unlock(); } static int _qp_stats_seq_show(struct seq_file *s, void *iter_ptr) |