Mercurial > pt1.oyama
changeset 51:c915076353ae
backout 23b6f99f65b2 for now. it may cause scheduling while atomic operation.
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sat, 29 Aug 2009 04:26:33 +0900 |
| parents | 23b6f99f65b2 |
| children | db7af62da709 |
| files | driver/pt1_pci.c |
| diffstat | 1 files changed, 2 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/driver/pt1_pci.c Thu Aug 27 21:39:14 2009 +0900 +++ b/driver/pt1_pci.c Sat Aug 29 04:26:33 2009 +0900 @@ -51,10 +51,8 @@ MODULE_DESCRIPTION(DRIVER_DESC); MODULE_LICENSE("GPL"); -static int debug = 7; /* 1 normal messages, 0 quiet .. - 7 verbose. */ -static int lnb = 0; /* LNB OFF:0 +11V:1 +15V:2 */ -static spinlock_t lock; /* to synchronize at probing */ +static int debug = 7; /* 1 normal messages, 0 quiet .. 7 verbose. */ +static int lnb = 0; /* LNB OFF:0 +11V:1 +15V:2 */ module_param(debug, int, 0); module_param(lnb, int, 0); @@ -700,9 +698,6 @@ goto out_err_fpga; } } - - spin_lock(&lock); - // ½é´ü²½´°Î» for(lp = 0 ; lp < MAX_CHANNEL ; lp++){ set_sleepmode(dev_conf->regs, &dev_conf->lock, @@ -712,7 +707,6 @@ } rc = alloc_chrdev_region(&dev_conf->dev, 0, MAX_CHANNEL, DEV_NAME); if(rc < 0){ - spin_unlock(&lock); goto out_err_fpga; } @@ -729,9 +723,6 @@ break ; } } - - spin_unlock(&lock); - for(lp = 0 ; lp < MAX_CHANNEL ; lp++){ cdev_init(&dev_conf->cdev[lp], &pt1_fops); dev_conf->cdev[lp].owner = THIS_MODULE; @@ -919,7 +910,6 @@ pt1video_class = class_create(THIS_MODULE, DRIVERNAME); if (IS_ERR(pt1video_class)) return PTR_ERR(pt1video_class); - spin_lock_init(&lock); return pci_register_driver(&pt1_driver); }