Module Name: src
Committed By: thorpej
Date: Mon Dec 23 18:20:02 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_hdmi.c
Log Message:
No need to use I2C_F_POLL here.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/sunxi/sunxi_hdmi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_hdmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.9 src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.10
--- src/sys/arch/arm/sunxi/sunxi_hdmi.c:1.9 Mon Dec 23 00:24:02 2019
+++ src/sys/arch/arm/sunxi/sunxi_hdmi.c Mon Dec 23 18:20:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_hdmi.c,v 1.9 2019/12/23 00:24:02 thorpej Exp $ */
+/* $NetBSD: sunxi_hdmi.c,v 1.10 2019/12/23 18:20:02 thorpej Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.9 2019/12/23 00:24:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hdmi.c,v 1.10 2019/12/23 18:20:02 thorpej Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -637,14 +637,14 @@ sunxi_hdmi_read_edid_block(struct sunxi_
uint8_t wbuf[2];
int error;
- if ((error = iic_acquire_bus(tag, I2C_F_POLL)) != 0)
+ if ((error = iic_acquire_bus(tag, 0)) != 0)
return error;
wbuf[0] = block; /* start address */
error = iic_exec(tag, I2C_OP_READ_WITH_STOP, DDC_ADDR, wbuf, 1,
- data, EDID_BLOCK_SIZE, I2C_F_POLL);
- iic_release_bus(tag, I2C_F_POLL);
+ data, EDID_BLOCK_SIZE, 0);
+ iic_release_bus(tag, 0);
return error;
}
