Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty/n_gsm: fix bug in CRC calculation for gsm1 mode serial/imx: read cts state only after acking cts change irq parport_pc.c: correctly release the requested region for the IT887x
This commit is contained in:
Коммит
0f1d9f78ce
|
@ -2550,7 +2550,6 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
|
|||
const struct parport_pc_via_data *via)
|
||||
{
|
||||
short inta_addr[6] = { 0x2A0, 0x2C0, 0x220, 0x240, 0x1E0 };
|
||||
struct resource *base_res;
|
||||
u32 ite8872set;
|
||||
u32 ite8872_lpt, ite8872_lpthi;
|
||||
u8 ite8872_irq, type;
|
||||
|
@ -2561,8 +2560,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
|
|||
|
||||
/* make sure which one chip */
|
||||
for (i = 0; i < 5; i++) {
|
||||
base_res = request_region(inta_addr[i], 32, "it887x");
|
||||
if (base_res) {
|
||||
if (request_region(inta_addr[i], 32, "it887x")) {
|
||||
int test;
|
||||
pci_write_config_dword(pdev, 0x60,
|
||||
0xe5000000 | inta_addr[i]);
|
||||
|
@ -2571,7 +2569,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
|
|||
test = inb(inta_addr[i]);
|
||||
if (test != 0xff)
|
||||
break;
|
||||
release_region(inta_addr[i], 0x8);
|
||||
release_region(inta_addr[i], 32);
|
||||
}
|
||||
}
|
||||
if (i >= 5) {
|
||||
|
@ -2635,7 +2633,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
|
|||
/*
|
||||
* Release the resource so that parport_pc_probe_port can get it.
|
||||
*/
|
||||
release_resource(base_res);
|
||||
release_region(inta_addr[i], 32);
|
||||
if (parport_pc_probe_port(ite8872_lpt, ite8872_lpthi,
|
||||
irq, PARPORT_DMA_NONE, &pdev->dev, 0)) {
|
||||
printk(KERN_INFO
|
||||
|
|
|
@ -1658,8 +1658,12 @@ static void gsm_queue(struct gsm_mux *gsm)
|
|||
|
||||
if ((gsm->control & ~PF) == UI)
|
||||
gsm->fcs = gsm_fcs_add_block(gsm->fcs, gsm->buf, gsm->len);
|
||||
/* generate final CRC with received FCS */
|
||||
gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
|
||||
if (gsm->encoding == 0){
|
||||
/* WARNING: gsm->received_fcs is used for gsm->encoding = 0 only.
|
||||
In this case it contain the last piece of data
|
||||
required to generate final CRC */
|
||||
gsm->fcs = gsm_fcs_add(gsm->fcs, gsm->received_fcs);
|
||||
}
|
||||
if (gsm->fcs != GOOD_FCS) {
|
||||
gsm->bad_fcs++;
|
||||
if (debug & 4)
|
||||
|
|
|
@ -382,12 +382,13 @@ static void imx_start_tx(struct uart_port *port)
|
|||
static irqreturn_t imx_rtsint(int irq, void *dev_id)
|
||||
{
|
||||
struct imx_port *sport = dev_id;
|
||||
unsigned int val = readl(sport->port.membase + USR1) & USR1_RTSS;
|
||||
unsigned int val;
|
||||
unsigned long flags;
|
||||
|
||||
spin_lock_irqsave(&sport->port.lock, flags);
|
||||
|
||||
writel(USR1_RTSD, sport->port.membase + USR1);
|
||||
val = readl(sport->port.membase + USR1) & USR1_RTSS;
|
||||
uart_handle_cts_change(&sport->port, !!val);
|
||||
wake_up_interruptible(&sport->port.state->port.delta_msr_wait);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче