]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: serial: mos7720: fix parallel-port state restore
authorJohan Hovold <johan@kernel.org>
Wed, 4 Nov 2020 16:47:27 +0000 (17:47 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:42:43 +0000 (13:42 +0100)
commit 975323ab8f116667676c30ca3502a6757bd89e8d upstream.

The parallel-port restore operations is called when a driver claims the
port and is supposed to restore the provided state (e.g. saved when
releasing the port).

Fixes: b69578df7e98 ("USB: usbserial: mos7720: add support for parallel port on moschip 7715")
Cc: stable <stable@vger.kernel.org> # 2.6.35
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/mos7720.c

index 1927f41ccafc4851465d305e5bdab97258dfe5b0..1d8a6c17c9eb05992cbd9c8d8c4b99b3ec25cfd3 100644 (file)
@@ -640,6 +640,8 @@ static void parport_mos7715_restore_state(struct parport *pp,
                spin_unlock(&release_lock);
                return;
        }
+       mos_parport->shadowDCR = s->u.pc.ctr;
+       mos_parport->shadowECR = s->u.pc.ecr;
        write_parport_reg_nonblock(mos_parport, MOS7720_DCR,
                                   mos_parport->shadowDCR);
        write_parport_reg_nonblock(mos_parport, MOS7720_ECR,