diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/dma-debug.c | 4 | ||||
-rw-r--r-- | lib/fault-inject.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 518aea714d21..66ce41489133 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
@@ -78,7 +78,7 @@ static LIST_HEAD(free_entries); | |||
78 | static DEFINE_SPINLOCK(free_entries_lock); | 78 | static DEFINE_SPINLOCK(free_entries_lock); |
79 | 79 | ||
80 | /* Global disable flag - will be set in case of an error */ | 80 | /* Global disable flag - will be set in case of an error */ |
81 | static bool global_disable __read_mostly; | 81 | static u32 global_disable __read_mostly; |
82 | 82 | ||
83 | /* Global error count */ | 83 | /* Global error count */ |
84 | static u32 error_count; | 84 | static u32 error_count; |
@@ -657,7 +657,7 @@ static int dma_debug_fs_init(void) | |||
657 | 657 | ||
658 | global_disable_dent = debugfs_create_bool("disabled", 0444, | 658 | global_disable_dent = debugfs_create_bool("disabled", 0444, |
659 | dma_debug_dent, | 659 | dma_debug_dent, |
660 | (u32 *)&global_disable); | 660 | &global_disable); |
661 | if (!global_disable_dent) | 661 | if (!global_disable_dent) |
662 | goto out_err; | 662 | goto out_err; |
663 | 663 | ||
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index 6805453c18e7..f7210ad6cffd 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c | |||
@@ -101,6 +101,10 @@ static inline bool fail_stacktrace(struct fault_attr *attr) | |||
101 | 101 | ||
102 | bool should_fail(struct fault_attr *attr, ssize_t size) | 102 | bool should_fail(struct fault_attr *attr, ssize_t size) |
103 | { | 103 | { |
104 | /* No need to check any other properties if the probability is 0 */ | ||
105 | if (attr->probability == 0) | ||
106 | return false; | ||
107 | |||
104 | if (attr->task_filter && !fail_task(attr, current)) | 108 | if (attr->task_filter && !fail_task(attr, current)) |
105 | return false; | 109 | return false; |
106 | 110 | ||