diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:19:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 16:19:26 +0200 |
commit | 9b9b181ce53ef387dfe3df9316bbc641fca13d51 (patch) | |
tree | acc34cf3d5172536c37de61eafbda399163e4265 /drivers/scsi/sd.c | |
parent | fb71e45338453698bd7460f7e8f171ea0304d218 (diff) | |
parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
download | op-kernel-dev-9b9b181ce53ef387dfe3df9316bbc641fca13d51.zip op-kernel-dev-9b9b181ce53ef387dfe3df9316bbc641fca13d51.tar.gz |
Merge commit 'v2.6.27-rc7' into core/locking
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 2a2bc89..e5e7d78 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1875,7 +1875,6 @@ static int sd_probe(struct device *dev) dev_set_drvdata(dev, sdkp); add_disk(gd); - blk_register_filter(gd); sd_dif_config_host(sdkp); sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", @@ -1909,7 +1908,6 @@ static int sd_remove(struct device *dev) struct scsi_disk *sdkp = dev_get_drvdata(dev); device_del(&sdkp->dev); - blk_unregister_filter(sdkp->disk); del_gendisk(sdkp->disk); sd_shutdown(dev); |