diff options
-rw-r--r-- | drivers/scsi/sd.c | 5 | ||||
-rw-r--r-- | drivers/scsi/sr.c | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7d257465bd98..e56730214c05 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -1086,13 +1086,8 @@ out: | |||
1086 | * | 1086 | * |
1087 | * Medium present state has changed in either direction. | 1087 | * Medium present state has changed in either direction. |
1088 | * Device has indicated UNIT_ATTENTION. | 1088 | * Device has indicated UNIT_ATTENTION. |
1089 | * | ||
1090 | * Report SDEV_EVT_MEDIA_CHANGE too for backward compatibility. | ||
1091 | */ | 1089 | */ |
1092 | if (sdp->changed) | ||
1093 | sdev_evt_send_simple(sdp, SDEV_EVT_MEDIA_CHANGE, GFP_KERNEL); | ||
1094 | kfree(sshdr); | 1090 | kfree(sshdr); |
1095 | |||
1096 | retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0; | 1091 | retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0; |
1097 | sdp->changed = 0; | 1092 | sdp->changed = 0; |
1098 | return retval; | 1093 | return retval; |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index be6baf8ad704..aefadc6a1607 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -249,10 +249,6 @@ skip_tur: | |||
249 | cd->device->changed = 0; | 249 | cd->device->changed = 0; |
250 | } | 250 | } |
251 | 251 | ||
252 | /* for backward compatibility */ | ||
253 | if (events & DISK_EVENT_MEDIA_CHANGE) | ||
254 | sdev_evt_send_simple(cd->device, SDEV_EVT_MEDIA_CHANGE, | ||
255 | GFP_KERNEL); | ||
256 | return events; | 252 | return events; |
257 | } | 253 | } |
258 | 254 | ||