Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db1db294 authored by Samuel Iglesias Gonsalvez's avatar Samuel Iglesias Gonsalvez Committed by Greg Kroah-Hartman
Browse files

Staging: ipack/devices/ipoctal: fix oops when accessing "buffer" 



The buffer[][] field was replaced by tty_port->xmit_buf field but there was
some places that "buffer" was still accessed, giving a kernel oops because
it was uninitialized.

Signed-off-by: default avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7756d3e8

drivers/staging/ipack/devices/ipoctal.c

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct ipoctal { 
	struct scc2698_channel		*chan_regs;

	struct scc2698_block		*block_regs;

	struct ipoctal_stats		chan_stats[NR_CHANNELS];

	char				*buffer[NR_CHANNELS];

	unsigned int			nb_bytes[NR_CHANNELS];

	unsigned int			count_wr[NR_CHANNELS];

	wait_queue_head_t		queue[NR_CHANNELS];
@@ -305,7 +304,7 @@ static int ipoctal_irq_handler(void *arg) 
				continue;

			}

			spin_lock(&ipoctal->lock[channel]);

			value = ipoctal->buffer[channel][*pointer_write];

			value = ipoctal->tty_port[channel].xmit_buf[*pointer_write];

			ipoctal_write_io_reg(ipoctal,

					     &ipoctal->chan_regs[channel].u.w.thr,

					     value);