patch-drivers_isdn_hardware_mISDN_udevice_c 1.5 KB

123456789101112131415161718192021222324252627282930313233343536
  1. - same as with core.c
  2. --- mISDN-1_1_9_2.orig/drivers/isdn/hardware/mISDN/udevice.c 2009-01-22 14:36:34.000000000 +0100
  3. +++ mISDN-1_1_9_2/drivers/isdn/hardware/mISDN/udevice.c 2011-07-11 13:54:44.650001546 +0200
  4. @@ -57,7 +57,7 @@ typedef struct entity_item {
  5. } entity_item_t;
  6. static LIST_HEAD(mISDN_devicelist);
  7. -static rwlock_t mISDN_device_lock = RW_LOCK_UNLOCKED;
  8. +static rwlock_t mISDN_device_lock = __RW_LOCK_UNLOCKED(old_style_rw_init);
  9. static mISDNobject_t udev_obj;
  10. static char MName[] = "UserDevice";
  11. @@ -1458,7 +1458,7 @@ init_device(u_int minor) {
  12. init_waitqueue_head(&dev->wport.procq);
  13. skb_queue_head_init(&dev->rport.queue);
  14. skb_queue_head_init(&dev->wport.queue);
  15. - init_MUTEX(&dev->io_sema);
  16. + sema_init(&dev->io_sema, 1);
  17. INIT_LIST_HEAD(&dev->layerlist);
  18. INIT_LIST_HEAD(&dev->stacklist);
  19. INIT_LIST_HEAD(&dev->timerlist);
  20. @@ -1557,12 +1557,12 @@ mISDN_open(struct inode *ino, struct fil
  21. return(-ENOMEM);
  22. dev->open_mode |= filep->f_mode & (FMODE_READ | FMODE_WRITE);
  23. if (dev->open_mode & FMODE_READ){
  24. - dev->rport.lock = SPIN_LOCK_UNLOCKED;
  25. + dev->rport.lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
  26. dev->rport.maxqlen = DEFAULT_PORT_QUEUELEN;
  27. test_and_set_bit(FLG_mISDNPORT_OPEN, &dev->rport.Flag);
  28. }
  29. if (dev->open_mode & FMODE_WRITE) {
  30. - dev->wport.lock = SPIN_LOCK_UNLOCKED;
  31. + dev->wport.lock = __SPIN_LOCK_UNLOCKED(old_style_spin_init);
  32. dev->wport.maxqlen = DEFAULT_PORT_QUEUELEN;
  33. test_and_set_bit(FLG_mISDNPORT_OPEN, &dev->wport.Flag);
  34. }