diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-27 19:28:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-27 19:28:34 +0200 |
| commit | 005fbcd03458b6c0044f65c1fe8d8a68d726a321 (patch) | |
| tree | 60265e75c50f3acf802e195363f44b8a10acdf80 /arch | |
| parent | Merge tag 'usb-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
| parent | s390/ccwgroup: Fix memory corruption (diff) | |
| download | linux-005fbcd03458b6c0044f65c1fe8d8a68d726a321.tar.xz linux-005fbcd03458b6c0044f65c1fe8d8a68d726a321.zip | |
Merge tag 'driver-core-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are some kernfs fixes for 3.15-rc3 that resolve some reported
problems. Nothing huge, but all needed"
* tag 'driver-core-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
s390/ccwgroup: Fix memory corruption
kernfs: add back missing error check in kernfs_fop_mmap()
kernfs: fix a subdir count leak
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/include/asm/ccwgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h index 6e670f88d125..ebc2913f9ee0 100644 --- a/arch/s390/include/asm/ccwgroup.h +++ b/arch/s390/include/asm/ccwgroup.h @@ -22,8 +22,8 @@ struct ccwgroup_device { /* public: */ unsigned int count; struct device dev; - struct ccw_device *cdev[0]; struct work_struct ungroup_work; + struct ccw_device *cdev[0]; }; /** |