aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ebc80354714c..a3406bd62391 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1,3 +1,4 @@
1// SPDX-License-Identifier: GPL-2.0-only
1/* 2/*
2 * sd.c Copyright (C) 1992 Drew Eckhardt 3 * sd.c Copyright (C) 1992 Drew Eckhardt
3 * Copyright (C) 1993, 1994, 1995, 1999 Eric Youngdale 4 * Copyright (C) 1993, 1994, 1995, 1999 Eric Youngdale
@@ -2571,7 +2572,6 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
2571 int res; 2572 int res;
2572 struct scsi_device *sdp = sdkp->device; 2573 struct scsi_device *sdp = sdkp->device;
2573 struct scsi_mode_data data; 2574 struct scsi_mode_data data;
2574 int disk_ro = get_disk_ro(sdkp->disk);
2575 int old_wp = sdkp->write_prot; 2575 int old_wp = sdkp->write_prot;
2576 2576
2577 set_disk_ro(sdkp->disk, 0); 2577 set_disk_ro(sdkp->disk, 0);
@@ -2612,7 +2612,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
2612 "Test WP failed, assume Write Enabled\n"); 2612 "Test WP failed, assume Write Enabled\n");
2613 } else { 2613 } else {
2614 sdkp->write_prot = ((data.device_specific & 0x80) != 0); 2614 sdkp->write_prot = ((data.device_specific & 0x80) != 0);
2615 set_disk_ro(sdkp->disk, sdkp->write_prot || disk_ro); 2615 set_disk_ro(sdkp->disk, sdkp->write_prot);
2616 if (sdkp->first_scan || old_wp != sdkp->write_prot) { 2616 if (sdkp->first_scan || old_wp != sdkp->write_prot) {
2617 sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n", 2617 sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
2618 sdkp->write_prot ? "on" : "off"); 2618 sdkp->write_prot ? "on" : "off");