diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 06:52:33 -0400 |
| commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
| tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /drivers/scsi/sd.c | |
| parent | fd9470ce3ac6fb54d6026e4b1cdab0936e34805e (diff) | |
| parent | 7c8ad9828e793573877fd60868bb5d2f1e3b64da (diff) | |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e5e7d7856454..2a2bc89aba83 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -1875,6 +1875,7 @@ static int sd_probe(struct device *dev) | |||
| 1875 | 1875 | ||
| 1876 | dev_set_drvdata(dev, sdkp); | 1876 | dev_set_drvdata(dev, sdkp); |
| 1877 | add_disk(gd); | 1877 | add_disk(gd); |
| 1878 | blk_register_filter(gd); | ||
| 1878 | sd_dif_config_host(sdkp); | 1879 | sd_dif_config_host(sdkp); |
| 1879 | 1880 | ||
| 1880 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", | 1881 | sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n", |
| @@ -1908,6 +1909,7 @@ static int sd_remove(struct device *dev) | |||
| 1908 | struct scsi_disk *sdkp = dev_get_drvdata(dev); | 1909 | struct scsi_disk *sdkp = dev_get_drvdata(dev); |
| 1909 | 1910 | ||
| 1910 | device_del(&sdkp->dev); | 1911 | device_del(&sdkp->dev); |
| 1912 | blk_unregister_filter(sdkp->disk); | ||
| 1911 | del_gendisk(sdkp->disk); | 1913 | del_gendisk(sdkp->disk); |
| 1912 | sd_shutdown(dev); | 1914 | sd_shutdown(dev); |
| 1913 | 1915 | ||