.. | .. |
---|
530 | 530 | DEBUGP(5, dev, "NumRecBytes is valid\n"); |
---|
531 | 531 | break; |
---|
532 | 532 | } |
---|
533 | | - mdelay(10); |
---|
| 533 | + usleep_range(10000, 11000); |
---|
534 | 534 | } |
---|
535 | 535 | if (i == 100) { |
---|
536 | 536 | DEBUGP(5, dev, "Timeout waiting for NumRecBytes getting " |
---|
.. | .. |
---|
550 | 550 | } |
---|
551 | 551 | break; |
---|
552 | 552 | } |
---|
553 | | - mdelay(10); |
---|
| 553 | + usleep_range(10000, 11000); |
---|
554 | 554 | } |
---|
555 | 555 | |
---|
556 | 556 | /* check whether it is a short PTS reply? */ |
---|
.. | .. |
---|
735 | 735 | } |
---|
736 | 736 | |
---|
737 | 737 | switch (dev->mstate) { |
---|
| 738 | + case M_CARDOFF: { |
---|
738 | 739 | unsigned char flags0; |
---|
739 | | - case M_CARDOFF: |
---|
| 740 | + |
---|
740 | 741 | DEBUGP(4, dev, "M_CARDOFF\n"); |
---|
741 | 742 | flags0 = inb(REG_FLAGS0(iobase)); |
---|
742 | 743 | if (flags0 & 0x02) { |
---|
.. | .. |
---|
759 | 760 | dev->mdelay = T_50MSEC; |
---|
760 | 761 | } |
---|
761 | 762 | break; |
---|
| 763 | + } |
---|
762 | 764 | case M_FETCH_ATR: |
---|
763 | 765 | DEBUGP(4, dev, "M_FETCH_ATR\n"); |
---|
764 | 766 | xoutb(0x80, REG_FLAGS0(iobase)); |
---|
.. | .. |
---|
1406 | 1408 | unsigned int iobase = dev->p_dev->resource[0]->start; |
---|
1407 | 1409 | struct inode *inode = file_inode(filp); |
---|
1408 | 1410 | struct pcmcia_device *link; |
---|
1409 | | - int size; |
---|
1410 | 1411 | int rc; |
---|
1411 | 1412 | void __user *argp = (void __user *)arg; |
---|
1412 | 1413 | #ifdef CM4000_DEBUG |
---|
.. | .. |
---|
1442 | 1443 | if (_IOC_NR(cmd) > CM_IOC_MAXNR) { |
---|
1443 | 1444 | DEBUGP(4, dev, "iocnr mismatch\n"); |
---|
1444 | 1445 | goto out; |
---|
1445 | | - } |
---|
1446 | | - size = _IOC_SIZE(cmd); |
---|
1447 | | - rc = -EFAULT; |
---|
1448 | | - DEBUGP(4, dev, "iocdir=%.4x iocr=%.4x iocw=%.4x iocsize=%d cmd=%.4x\n", |
---|
1449 | | - _IOC_DIR(cmd), _IOC_READ, _IOC_WRITE, size, cmd); |
---|
1450 | | - |
---|
1451 | | - if (_IOC_DIR(cmd) & _IOC_READ) { |
---|
1452 | | - if (!access_ok(VERIFY_WRITE, argp, size)) |
---|
1453 | | - goto out; |
---|
1454 | | - } |
---|
1455 | | - if (_IOC_DIR(cmd) & _IOC_WRITE) { |
---|
1456 | | - if (!access_ok(VERIFY_READ, argp, size)) |
---|
1457 | | - goto out; |
---|
1458 | 1446 | } |
---|
1459 | 1447 | rc = 0; |
---|
1460 | 1448 | |
---|
.. | .. |
---|
1686 | 1674 | link->open = 1; /* only one open per device */ |
---|
1687 | 1675 | |
---|
1688 | 1676 | DEBUGP(2, dev, "<- cmm_open\n"); |
---|
1689 | | - ret = nonseekable_open(inode, filp); |
---|
| 1677 | + ret = stream_open(inode, filp); |
---|
1690 | 1678 | out: |
---|
1691 | 1679 | mutex_unlock(&cmm_mutex); |
---|
1692 | 1680 | return ret; |
---|