diff options
Diffstat (limited to 'drivers/ide/ide-gd.c')
-rw-r--r-- | drivers/ide/ide-gd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index 84bbcfee9233..c08500270b9d 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c | |||
@@ -160,6 +160,7 @@ static int ide_gd_open(struct inode *inode, struct file *filp) | |||
160 | * and the door_lock is irrelevant at this point. | 160 | * and the door_lock is irrelevant at this point. |
161 | */ | 161 | */ |
162 | ide_disk_set_doorlock(drive, 1); | 162 | ide_disk_set_doorlock(drive, 1); |
163 | drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED; | ||
163 | check_disk_change(inode->i_bdev); | 164 | check_disk_change(inode->i_bdev); |
164 | } | 165 | } |
165 | return 0; | 166 | return 0; |
@@ -199,6 +200,7 @@ static int ide_gd_media_changed(struct gendisk *disk) | |||
199 | { | 200 | { |
200 | struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj); | 201 | struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj); |
201 | ide_drive_t *drive = idkp->drive; | 202 | ide_drive_t *drive = idkp->drive; |
203 | int ret; | ||
202 | 204 | ||
203 | /* do not scan partitions twice if this is a removable device */ | 205 | /* do not scan partitions twice if this is a removable device */ |
204 | if (drive->dev_flags & IDE_DFLAG_ATTACH) { | 206 | if (drive->dev_flags & IDE_DFLAG_ATTACH) { |
@@ -206,8 +208,10 @@ static int ide_gd_media_changed(struct gendisk *disk) | |||
206 | return 0; | 208 | return 0; |
207 | } | 209 | } |
208 | 210 | ||
209 | /* if removable, always assume it was changed */ | 211 | ret = !!(drive->dev_flags & IDE_DFLAG_MEDIA_CHANGED); |
210 | return !!(drive->dev_flags & IDE_DFLAG_REMOVABLE); | 212 | drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED; |
213 | |||
214 | return ret; | ||
211 | } | 215 | } |
212 | 216 | ||
213 | static int ide_gd_revalidate_disk(struct gendisk *disk) | 217 | static int ide_gd_revalidate_disk(struct gendisk *disk) |