git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mtd: jedec_probe: Fix crash in jedec_read_mfr()
[pandora-kernel.git]
/
drivers
/
scsi
/
hosts.c
diff --git
a/drivers/scsi/hosts.c
b/drivers/scsi/hosts.c
index
351dc0b
..
ee77a58
100644
(file)
--- a/
drivers/scsi/hosts.c
+++ b/
drivers/scsi/hosts.c
@@
-287,6
+287,7
@@
static void scsi_host_dev_release(struct device *dev)
struct Scsi_Host *shost = dev_to_shost(dev);
struct device *parent = dev->parent;
struct request_queue *q;
struct Scsi_Host *shost = dev_to_shost(dev);
struct device *parent = dev->parent;
struct request_queue *q;
+ void *queuedata;
scsi_proc_hostdir_rm(shost->hostt);
scsi_proc_hostdir_rm(shost->hostt);
@@
-296,9
+297,9
@@
static void scsi_host_dev_release(struct device *dev)
destroy_workqueue(shost->work_q);
q = shost->uspace_req_q;
if (q) {
destroy_workqueue(shost->work_q);
q = shost->uspace_req_q;
if (q) {
-
kfree(q->queuedata)
;
-
q->queuedata = NULL
;
-
scsi_free_queue(q
);
+
queuedata = q->queuedata
;
+
blk_cleanup_queue(q)
;
+
kfree(queuedata
);
}
scsi_destroy_command_freelist(shost);
}
scsi_destroy_command_freelist(shost);