diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-05 22:39:49 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-05 22:39:49 +0100 |
| commit | 450cbfbbbd88876e3ccec1d277f613221ca82bb7 (patch) | |
| tree | af0f1b4c706ba7e725cd4e877a8b7ecf021d76c2 /drivers/base/core.c | |
| parent | d53ee3222459f347cb18985a845864bc81a44eaf (diff) | |
| parent | bfd4bda097f8758d28e632ff2035e25577f6b060 (diff) | |
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'drivers/base/core.c')
| -rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index a7cedd8cefe5..268a9c8d168b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -139,7 +139,7 @@ static int dev_hotplug(struct kset *kset, struct kobject *kobj, char **envp, buffer = &buffer[length]; buffer_size -= length; - if (dev->bus->hotplug) { + if (dev->bus && dev->bus->hotplug) { /* have the bus specific function add its stuff */ retval = dev->bus->hotplug (dev, envp, num_envp, buffer, buffer_size); if (retval) { |