← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/s390/cio/chsc_sch.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/s390/cio/chsc_sch.c
50
50
 
51
51
static void chsc_subchannel_irq(struct subchannel *sch)
52
52
{
53
 
        struct chsc_private *private = sch->private;
 
53
        struct chsc_private *private = dev_get_drvdata(&sch->dev);
54
54
        struct chsc_request *request = private->request;
55
55
        struct irb *irb = (struct irb *)&S390_lowcore.irb;
56
56
 
80
80
        private = kzalloc(sizeof(*private), GFP_KERNEL);
81
81
        if (!private)
82
82
                return -ENOMEM;
 
83
        dev_set_drvdata(&sch->dev, private);
83
84
        ret = cio_enable_subchannel(sch, (u32)(unsigned long)sch);
84
85
        if (ret) {
85
86
                CHSC_MSG(0, "Failed to enable 0.%x.%04x: %d\n",
86
87
                         sch->schid.ssid, sch->schid.sch_no, ret);
 
88
                dev_set_drvdata(&sch->dev, NULL);
87
89
                kfree(private);
88
90
        } else {
89
 
                sch->private = private;
90
91
                if (dev_get_uevent_suppress(&sch->dev)) {
91
92
                        dev_set_uevent_suppress(&sch->dev, 0);
92
93
                        kobject_uevent(&sch->dev.kobj, KOBJ_ADD);
100
101
        struct chsc_private *private;
101
102
 
102
103
        cio_disable_subchannel(sch);
103
 
        private = sch->private;
104
 
        sch->private = NULL;
 
104
        private = dev_get_drvdata(&sch->dev);
 
105
        dev_set_drvdata(&sch->dev, NULL);
105
106
        if (private->request) {
106
107
                complete(&private->request->completion);
107
108
                put_device(&sch->dev);
147
148
MODULE_DEVICE_TABLE(css, chsc_subchannel_ids);
148
149
 
149
150
static struct css_driver chsc_subchannel_driver = {
150
 
        .owner = THIS_MODULE,
 
151
        .drv = {
 
152
                .owner = THIS_MODULE,
 
153
                .name = "chsc_subchannel",
 
154
        },
151
155
        .subchannel_type = chsc_subchannel_ids,
152
156
        .irq = chsc_subchannel_irq,
153
157
        .probe = chsc_subchannel_probe,
157
161
        .freeze = chsc_subchannel_freeze,
158
162
        .thaw = chsc_subchannel_restore,
159
163
        .restore = chsc_subchannel_restore,
160
 
        .name = "chsc_subchannel",
161
164
};
162
165
 
163
166
static int __init chsc_init_dbfs(void)
241
244
        chsc_area->header.key = PAGE_DEFAULT_KEY >> 4;
242
245
        while ((sch = chsc_get_next_subchannel(sch))) {
243
246
                spin_lock(sch->lock);
244
 
                private = sch->private;
 
247
                private = dev_get_drvdata(&sch->dev);
245
248
                if (private->request) {
246
249
                        spin_unlock(sch->lock);
247
250
                        ret = -EBUSY;