diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2023-01-22 08:37:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2023-01-22 08:37:23 +0100 |
| commit | 99ba2ad1db623df79456b8556b3f4900f394c8c2 (patch) | |
| tree | 2bf6a20de87f0a5b944fd69d53723fc4710d7b7e /drivers/comedi | |
| parent | firmware: dmi-sysfs: Fix null-ptr-deref in dmi_sysfs_register_handle (diff) | |
| parent | Linux 6.2-rc5 (diff) | |
| download | linux-99ba2ad1db623df79456b8556b3f4900f394c8c2.tar.gz linux-99ba2ad1db623df79456b8556b3f4900f394c8c2.tar.bz2 linux-99ba2ad1db623df79456b8556b3f4900f394c8c2.zip | |
Merge 6.2-rc5 into char-misc-next
We need the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/comedi')
| -rw-r--r-- | drivers/comedi/drivers/adv_pci1760.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/comedi/drivers/adv_pci1760.c b/drivers/comedi/drivers/adv_pci1760.c index fcfc2e299110..27f3890f471d 100644 --- a/drivers/comedi/drivers/adv_pci1760.c +++ b/drivers/comedi/drivers/adv_pci1760.c @@ -58,7 +58,7 @@ #define PCI1760_CMD_CLR_IMB2 0x00 /* Clears IMB2 */ #define PCI1760_CMD_SET_DO 0x01 /* Set output state */ #define PCI1760_CMD_GET_DO 0x02 /* Read output status */ -#define PCI1760_CMD_GET_STATUS 0x03 /* Read current status */ +#define PCI1760_CMD_GET_STATUS 0x07 /* Read current status */ #define PCI1760_CMD_GET_FW_VER 0x0e /* Read firmware version */ #define PCI1760_CMD_GET_HW_VER 0x0f /* Read hardware version */ #define PCI1760_CMD_SET_PWM_HI(x) (0x10 + (x) * 2) /* Set "hi" period */ |