← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/staging/comedi/drivers/jr3_pci.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-3o58a3c1bj7x00rs
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/staging/comedi/drivers/jr3_pci.c
193
193
                set_s16(&channel->transforms[num].link[i].link_amount,
194
194
                        transf.link[i].link_amount);
195
195
                udelay(1);
196
 
                if (transf.link[i].link_type == end_x_form) {
 
196
                if (transf.link[i].link_type == end_x_form)
197
197
                        break;
198
 
                }
199
198
        }
200
199
}
201
200
 
460
459
                                unsigned int count, addr;
461
460
                                more = more
462
461
                                    && read_idm_word(data, size, &pos, &count);
463
 
                                if (more && count == 0xffff) {
 
462
                                if (more && count == 0xffff)
464
463
                                        break;
465
 
                                }
466
464
                                more = more
467
465
                                    && read_idm_word(data, size, &pos, &addr);
468
466
                                printk("Loading#%d %4.4x bytes at %4.4x\n", i,
793
791
        }
794
792
 
795
793
        result = alloc_private(dev, sizeof(struct jr3_pci_dev_private));
796
 
        if (result < 0) {
 
794
        if (result < 0)
797
795
                return -ENOMEM;
798
 
        }
799
796
        card = NULL;
800
797
        devpriv = dev->private;
801
798
        init_timer(&devpriv->timer);
851
848
        }
852
849
 
853
850
        result = comedi_pci_enable(card, "jr3_pci");
854
 
        if (result < 0) {
 
851
        if (result < 0)
855
852
                return -EIO;
856
 
        }
857
853
 
858
854
        devpriv->pci_enabled = 1;
859
855
        devpriv->iobase = ioremap(pci_resource_start(card, 0),
922
918
        result = comedi_load_firmware(dev, "jr3pci.idm", jr3_download_firmware);
923
919
        printk("Firmare load %d\n", result);
924
920
 
925
 
        if (result < 0) {
 
921
        if (result < 0)
926
922
                goto out;
927
 
        }
928
923
/*
929
924
 * TODO: use firmware to load preferred offset tables. Suggested
930
925
 * format:
973
968
                del_timer_sync(&devpriv->timer);
974
969
 
975
970
                if (dev->subdevices) {
976
 
                        for (i = 0; i < devpriv->n_channels; i++) {
 
971
                        for (i = 0; i < devpriv->n_channels; i++)
977
972
                                kfree(dev->subdevices[i].private);
978
 
                        }
979
973
                }
980
974
 
981
 
                if (devpriv->iobase) {
 
975
                if (devpriv->iobase)
982
976
                        iounmap((void *)devpriv->iobase);
983
 
                }
984
 
                if (devpriv->pci_enabled) {
 
977
                if (devpriv->pci_enabled)
985
978
                        comedi_pci_disable(devpriv->pci_dev);
986
 
                }
987
979
 
988
 
                if (devpriv->pci_dev) {
 
980
                if (devpriv->pci_dev)
989
981
                        pci_dev_put(devpriv->pci_dev);
990
 
                }
991
982
        }
992
983
        return 0;
993
984
}