← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to drivers/isdn/hardware/mISDN/hfcpci.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/isdn/hardware/mISDN/hfcpci.c
405
405
    u_char *bdata, int count)
406
406
{
407
407
        u_char          *ptr, *ptr1, new_f2;
408
 
        int             total, maxlen, new_z2;
 
408
        int             maxlen, new_z2;
409
409
        struct zt       *zp;
410
410
 
411
411
        if ((bch->debug & DEBUG_HW_BCHANNEL) && !(bch->debug & DEBUG_HW_BFIFO))
431
431
                        printk(KERN_WARNING "HFCPCI: receive out of memory\n");
432
432
                        return;
433
433
                }
434
 
                total = count;
435
434
                count -= 3;
436
435
                ptr = skb_put(bch->rx_skb, count);
437
436
 
968
967
ph_state_nt(struct dchannel *dch)
969
968
{
970
969
        struct hfc_pci  *hc = dch->hw;
971
 
        u_char  val;
972
970
 
973
971
        if (dch->debug)
974
972
                printk(KERN_DEBUG "%s: NT newstate %x\n",
982
980
                        hc->hw.int_m1 &= ~HFCPCI_INTS_TIMER;
983
981
                        Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
984
982
                        /* Clear already pending ints */
985
 
                        val = Read_hfc(hc, HFCPCI_INT_S1);
 
983
                        (void) Read_hfc(hc, HFCPCI_INT_S1);
986
984
                        Write_hfc(hc, HFCPCI_STATES, 4 | HFCPCI_LOAD_STATE);
987
985
                        udelay(10);
988
986
                        Write_hfc(hc, HFCPCI_STATES, 4);