← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/pcmcia/soc_common.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/pcmcia/soc_common.c
155
155
                 */
156
156
                if (skt->irq_state != 1 && state->io_irq) {
157
157
                        skt->irq_state = 1;
158
 
                        set_irq_type(skt->socket.pci_irq,
159
 
                                IRQ_TYPE_EDGE_FALLING);
 
158
                        irq_set_irq_type(skt->socket.pci_irq,
 
159
                                         IRQ_TYPE_EDGE_FALLING);
160
160
                } else if (skt->irq_state == 1 && state->io_irq == 0) {
161
161
                        skt->irq_state = 0;
162
 
                        set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE);
 
162
                        irq_set_irq_type(skt->socket.pci_irq, IRQ_TYPE_NONE);
163
163
                }
164
164
 
165
165
                skt->cs_state = *state;
537
537
                                  IRQF_DISABLED, irqs[i].str, skt);
538
538
                if (res)
539
539
                        break;
540
 
                set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
 
540
                irq_set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
541
541
        }
542
542
 
543
543
        if (res) {
570
570
 
571
571
        for (i = 0; i < nr; i++)
572
572
                if (irqs[i].sock == skt->nr)
573
 
                        set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
 
573
                        irq_set_irq_type(irqs[i].irq, IRQ_TYPE_NONE);
574
574
}
575
575
EXPORT_SYMBOL(soc_pcmcia_disable_irqs);
576
576
 
581
581
 
582
582
        for (i = 0; i < nr; i++)
583
583
                if (irqs[i].sock == skt->nr) {
584
 
                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING);
585
 
                        set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH);
 
584
                        irq_set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_RISING);
 
585
                        irq_set_irq_type(irqs[i].irq, IRQ_TYPE_EDGE_BOTH);
586
586
                }
587
587
}
588
588
EXPORT_SYMBOL(soc_pcmcia_enable_irqs);