diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-07-12 14:29:48 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-07-12 14:44:01 +0100 |
| commit | 9d25d62bb6ff62694e5226b02d79075eab304402 (patch) | |
| tree | 0266a51fcf23172569434523ffffe846b759b79d | |
| parent | 5175aff31e00e17786ebb97aaaf25ddd38b5e72e (diff) | |
igt/pm_rpm: Pass NULL to require no extra module options
We use options!=NULL to determine if we should require the module to be
reloaded and fail if we find it already loaded. In pm_rpm, we are only
ensuring the MSR module is loaded, and only want default options.
Fixes: 4dc2ce0e ("lib/kmod: Fail if the module is already loaded")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
| -rw-r--r-- | lib/sw_sync.c | 2 | ||||
| -rw-r--r-- | tests/pm_rpm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sw_sync.c b/lib/sw_sync.c index 619049b3..f2086033 100644 --- a/lib/sw_sync.c +++ b/lib/sw_sync.c @@ -223,7 +223,7 @@ int sync_fence_status(int fence) static void modprobe(const char *driver) { - igt_kmod_load(driver, ""); + igt_kmod_load(driver, NULL); } static bool kernel_has_sw_sync(void) diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index 51d8f366..1f2647be 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -125,7 +125,7 @@ static int8_t *pm_data = NULL; static int modprobe(const char *driver) { - return igt_kmod_load(driver, ""); + return igt_kmod_load(driver, NULL); } /* If the read fails, then the machine doesn't support PC8+ residencies. */ |