diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/scsi/sg.c | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 9adf35bd8b56..5103855242ae 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -327,7 +327,6 @@ sg_release(struct inode *inode, struct file *filp) | |||
| 327 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) | 327 | if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp))) |
| 328 | return -ENXIO; | 328 | return -ENXIO; |
| 329 | SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name)); | 329 | SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name)); |
| 330 | sg_fasync(-1, filp, 0); /* remove filp from async notification list */ | ||
| 331 | if (0 == sg_remove_sfp(sdp, sfp)) { /* Returns 1 when sdp gone */ | 330 | if (0 == sg_remove_sfp(sdp, sfp)) { /* Returns 1 when sdp gone */ |
| 332 | if (!sdp->detached) { | 331 | if (!sdp->detached) { |
| 333 | scsi_device_put(sdp->device); | 332 | scsi_device_put(sdp->device); |