From: Samuel Iglesias Gonsalvez Date: Mon, 25 Jun 2012 15:15:44 +0000 (+0200) Subject: Staging: ipack/devices/ipoctal: fix oops when accessing "buffer" X-Git-Tag: firefly_0821_release~3680^2~2356^2~592 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=db1db294d9366e95a76f4ca7e6442240eba67a0a;p=firefly-linux-kernel-4.4.55.git 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: Samuel Iglesias Gonsalvez Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ipack/devices/ipoctal.c b/drivers/staging/ipack/devices/ipoctal.c index 29214677ea0c..7fe1c932276b 100644 --- a/drivers/staging/ipack/devices/ipoctal.c +++ b/drivers/staging/ipack/devices/ipoctal.c @@ -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);