diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-13 13:24:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-13 13:24:08 -0400 |
| commit | a4dc32374ed6dd56e09039ea8b7151c3a3e2307d (patch) | |
| tree | c1a5482db418ff1adb0135ac9d3abd01d138c2ad /fs | |
| parent | 51feb98d2547a389be2f666514f5bcd658f79eab (diff) | |
| parent | 38c7dc373029e4666b17850054dd43c1c96bb264 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
wm97xx_batery: replace driver_data with dev_get_drvdata()
omap: video: remove direct access of driver_data
Sound: remove direct access of driver_data
driver model: fix show/store prototypes in doc.
Firmware: firmware_class, fix lock imbalance
Driver Core: remove BUS_ID_SIZE
sparc: remove driver-core BUS_ID_SIZE
partitions: fix broken uevent_suppress conversion
devres: WARN() and return, don't crash on device_del() of uninitialized device
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/partitions/check.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index 1a9c7878f864..ea4e6cb29e13 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c | |||
| @@ -436,7 +436,7 @@ struct hd_struct *add_partition(struct gendisk *disk, int partno, | |||
| 436 | rcu_assign_pointer(ptbl->part[partno], p); | 436 | rcu_assign_pointer(ptbl->part[partno], p); |
| 437 | 437 | ||
| 438 | /* suppress uevent if the disk supresses it */ | 438 | /* suppress uevent if the disk supresses it */ |
| 439 | if (!dev_get_uevent_suppress(pdev)) | 439 | if (!dev_get_uevent_suppress(ddev)) |
| 440 | kobject_uevent(&pdev->kobj, KOBJ_ADD); | 440 | kobject_uevent(&pdev->kobj, KOBJ_ADD); |
| 441 | 441 | ||
| 442 | return p; | 442 | return p; |