From: Li Ming <ming.li@zohomail.com>
Date: Tue, 10 Mar 2026 15:57:53 +0000 (+0800)
Subject: driver core: Add conditional guard support for device_lock()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb729bf1d6fdf5c2087c1651165c74cef0da1742;p=thirdparty%2Flinux.git

driver core: Add conditional guard support for device_lock()

Introduce conditional guard version of device_lock() for scenarios that
require conditional device lock holding.

Suggested-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Li Ming <ming.li@zohomail.com>
Link: https://patch.msgid.link/20260310-fix_access_endpoint_without_drv_check-v1-1-94fe919a0b87@zohomail.com
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---

diff --git a/include/linux/device.h b/include/linux/device.h
index 0be95294b6e61..4fafee80524bb 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -911,6 +911,7 @@ static inline void device_unlock(struct device *dev)
 }
 
 DEFINE_GUARD(device, struct device *, device_lock(_T), device_unlock(_T))
+DEFINE_GUARD_COND(device, _intr, device_lock_interruptible(_T), _RET == 0)
 
 static inline void device_lock_assert(struct device *dev)
 {