diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-08-09 15:28:08 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-08-09 15:28:08 +0200 |
| commit | 01a620d491592ead12eca039fe1c9e74908c35cf (patch) | |
| tree | 15271737ef24a7375f01eb928595ea3ba13c13ad /arch/um/drivers/mconsole_user.c | |
| parent | 74b0666f97f9455bc799405b7874df62fcb66bae (diff) | |
| parent | 9ba48db9f77ce0001dbb882476fa46e092feb695 (diff) | |
| download | linux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.gz linux-01a620d491592ead12eca039fe1c9e74908c35cf.tar.bz2 linux-01a620d491592ead12eca039fe1c9e74908c35cf.zip | |
Merge tag 'i2c-host-fixes-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
Two fixes on the Qualcomm GENI I2C controller are cleaning up the
error exit patch in the runtime_resume() function. The first is
disabling the clock, the second disables the icc on the way out.
Diffstat (limited to 'arch/um/drivers/mconsole_user.c')
| -rw-r--r-- | arch/um/drivers/mconsole_user.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c index e24298a734be..a04cd13c6315 100644 --- a/arch/um/drivers/mconsole_user.c +++ b/arch/um/drivers/mconsole_user.c @@ -71,7 +71,9 @@ static struct mconsole_command *mconsole_parse(struct mc_request *req) return NULL; } +#ifndef MIN #define MIN(a,b) ((a)<(b) ? (a):(b)) +#endif #define STRINGX(x) #x #define STRING(x) STRINGX(x) |