Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
Linus Torvalds [Tue, 26 Jul 2011 06:09:27 +0000 (23:09 -0700)]
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (26 commits)
  amba pl011: workaround for uart registers lockup
  n_gsm: fix the wrong FCS handling
  pch_uart: add missing comment about OKI ML7223
  pch_uart: Add MSI support
  tty: fix "IRQ45: nobody cared"
  PTI feature to allow user to name and mark masterchannel request.
  0 for o PTI Makefile bug.
  tty: serial: samsung.c remove legacy PM code.
  SERIAL: SC26xx: Fix link error.
  serial: mrst_max3110: initialize waitqueue earlier
  mrst_max3110: Change max missing message priority.
  tty: s5pv210: Add delay loop on fifo reset function for UART
  tty/serial: Fix XSCALE serial ports, e.g. ce4100
  serial: bfin_5xx: fix off-by-one with resource size
  drivers/tty: use printk_ratelimited() instead of printk_ratelimit()
  tty: n_gsm: Added refcount usage to gsm_mux and gsm_dlci structs
  tty: n_gsm: Add raw-ip support
  tty: n_gsm: expose gsmtty device nodes at ldisc open time
  pch_phub: Fix register miss-setting issue
  serial: 8250, increase PASS_LIMIT
  ...

12 files changed:
1  2 
drivers/misc/Makefile
drivers/misc/pch_phub.c
drivers/misc/pti.c
drivers/tty/n_gsm.c
drivers/tty/n_tty.c
drivers/tty/serial/8250.c
drivers/tty/serial/8250_pci.c
drivers/tty/serial/Kconfig
drivers/tty/serial/pch_uart.c
drivers/tty/serial/s5pv210.c
drivers/tty/serial/samsung.c
include/linux/pci_ids.h

Simple merge
Simple merge
@@@ -472,14 -492,12 +493,14 @@@ static int pti_tty_install(struct tty_d
                        return -ENOMEM;
  
                if (idx == PTITTY_MINOR_START)
-                       pti_tty_data->mc = pti_request_masterchannel(0);
+                       pti_tty_data->mc = pti_request_masterchannel(0, NULL);
                else
-                       pti_tty_data->mc = pti_request_masterchannel(2);
+                       pti_tty_data->mc = pti_request_masterchannel(2, NULL);
  
 -              if (pti_tty_data->mc == NULL)
 +              if (pti_tty_data->mc == NULL) {
 +                      kfree(pti_tty_data);
                        return -ENXIO;
 +              }
                tty->driver_data = pti_tty_data;
        }
  
@@@ -875,11 -904,12 +904,13 @@@ static int gsm_dlci_data_output_framed(
                *dp++ = last << 7 | first << 6 | 1;     /* EA */
                len--;
        }
 -      memcpy(dp, skb_pull(dlci->skb, len), len);
 +      memcpy(dp, dlci->skb->data, len);
 +      skb_pull(dlci->skb, len);
        __gsm_data_queue(dlci, msg);
-       if (last)
+       if (last) {
+               kfree_skb(dlci->skb);
                dlci->skb = NULL;
+       }
        return size;
  }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge