diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 16:28:47 -0400 |
commit | 2d986010ad13a00b83851238d52601d6092df40e (patch) | |
tree | 6a43ffd30290fc051435643d485ad12fb1448ed5 /drivers/scsi/hosts.c | |
parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
parent | e10fb91c4dc81a4ae47caf0828df152f600f2546 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/hosts.c')
-rw-r--r-- | drivers/scsi/hosts.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index d7a38b6713f..5feb886c339 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
@@ -180,11 +180,6 @@ static void scsi_host_dev_release(struct device *dev) | |||
180 | scsi_destroy_command_freelist(shost); | 180 | scsi_destroy_command_freelist(shost); |
181 | kfree(shost->shost_data); | 181 | kfree(shost->shost_data); |
182 | 182 | ||
183 | /* | ||
184 | * Some drivers (eg aha1542) do scsi_register()/scsi_unregister() | ||
185 | * during probing without performing a scsi_set_device() in between. | ||
186 | * In this case dev->parent is NULL. | ||
187 | */ | ||
188 | if (parent) | 183 | if (parent) |
189 | put_device(parent); | 184 | put_device(parent); |
190 | kfree(shost); | 185 | kfree(shost); |