mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (102 commits)
[SCSI] scsi_dh: fix kconfig related build errors
[SCSI] sym53c8xx: Fix bogus sym_que_entry re-implementation of container_of
[SCSI] scsi_cmnd.h: remove double inclusion of linux/blkdev.h
[SCSI] make struct scsi_{host,target}_type static
[SCSI] fix locking in host use of blk_plug_device()
[SCSI] zfcp: Cleanup external header file
[SCSI] zfcp: Cleanup code in zfcp_erp.c
[SCSI] zfcp: zfcp_fsf cleanup.
[SCSI] zfcp: consolidate sysfs things into one file.
[SCSI] zfcp: Cleanup of code in zfcp_aux.c
[SCSI] zfcp: Cleanup of code in zfcp_scsi.c
[SCSI] zfcp: Move status accessors from zfcp to SCSI include file.
[SCSI] zfcp: Small QDIO cleanups
[SCSI] zfcp: Adapter reopen for large number of unsolicited status
[SCSI] zfcp: Fix error checking for ELS ADISC requests
[SCSI] zfcp: wait until adapter is finished with ERP during auto-port
[SCSI] ibmvfc: IBM Power Virtual Fibre Channel Adapter Client Driver
[SCSI] sg: Add target reset support
[SCSI] lib: Add support for the T10 (SCSI) Data Integrity Field CRC
[SCSI] sd: Move scsi_disk() accessor function to sd.h
...
This commit is contained in:
commit
89a93f2f48
106 changed files with 14467 additions and 14257 deletions
|
|
@ -740,8 +740,13 @@ static int bsg_put_device(struct bsg_device *bd)
|
|||
mutex_lock(&bsg_mutex);
|
||||
|
||||
do_free = atomic_dec_and_test(&bd->ref_count);
|
||||
if (!do_free)
|
||||
if (!do_free) {
|
||||
mutex_unlock(&bsg_mutex);
|
||||
goto out;
|
||||
}
|
||||
|
||||
hlist_del(&bd->dev_list);
|
||||
mutex_unlock(&bsg_mutex);
|
||||
|
||||
dprintk("%s: tearing down\n", bd->name);
|
||||
|
||||
|
|
@ -757,10 +762,8 @@ static int bsg_put_device(struct bsg_device *bd)
|
|||
*/
|
||||
ret = bsg_complete_all_commands(bd);
|
||||
|
||||
hlist_del(&bd->dev_list);
|
||||
kfree(bd);
|
||||
out:
|
||||
mutex_unlock(&bsg_mutex);
|
||||
kref_put(&q->bsg_dev.ref, bsg_kref_release_function);
|
||||
if (do_free)
|
||||
blk_put_queue(q);
|
||||
|
|
|
|||
Loading…
Reference in a new issue