diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-15 07:02:33 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-15 07:02:49 -0400 |
| commit | e0ea136525d1270166a999b20d8c916b5936c6ca (patch) | |
| tree | 5bb569fe54a84941b4a2affaa5c8ff514bd14d8d /drivers/misc/cxl/main.c | |
| parent | e1749a757236564127e932703d3ed442d910e6d2 (diff) | |
| parent | 9908ac3daa3da2d236b5406b95d0865ddb8b29c4 (diff) | |
| download | op-kernel-dev-e0ea136525d1270166a999b20d8c916b5936c6ca.zip op-kernel-dev-e0ea136525d1270166a999b20d8c916b5936c6ca.tar.gz | |
Merge tag 'omap-for-v4.2/fixes-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Fixes for omaps, all dts changes except for one:
- Fix up LCD panel name for overo boards
- Three fixes for pepper board for regulators, freqeuncy
scaling and audio input. Note that there is still one
issue being worked on for booting with multi_v7_defconfig
- Add missing #iommu-cells for omap4 and 5
- Add missing HAVE_ARM_SCU for am43xx
* tag 'omap-for-v4.2/fixes-rc2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (210 commits)
ARM: dts: Correct audio input route & set mic bias for am335x-pepper
ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
ARM: dts: Fix frequency scaling on Gumstix Pepper
ARM: dts: configure regulators for Gumstix Pepper
ARM: dts: omap3: overo: Update LCD panel names
+ Linux 4.2-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/misc/cxl/main.c')
| -rw-r--r-- | drivers/misc/cxl/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cxl/main.c b/drivers/misc/cxl/main.c index 833348e..4a164ab 100644 --- a/drivers/misc/cxl/main.c +++ b/drivers/misc/cxl/main.c @@ -73,7 +73,7 @@ static inline void cxl_slbia_core(struct mm_struct *mm) spin_lock(&adapter->afu_list_lock); for (slice = 0; slice < adapter->slices; slice++) { afu = adapter->afu[slice]; - if (!afu->enabled) + if (!afu || !afu->enabled) continue; rcu_read_lock(); idr_for_each_entry(&afu->contexts_idr, ctx, id) |
