3 files changed, 6 insertions, 5 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 0bcacf71aef8..97f2accd3dbb 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -1298,7 +1298,7 @@ rescan_fifos:
 
         /*
          * Wait for any inprogress DMA to complete and clear DMA state
-         * if this if for an SCB in the qinfifo.
+         * if this is for an SCB in the qinfifo.
          */
         while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) {
 
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 8c27b6a77ec4..85510086a36c 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4223,7 +4223,7 @@ static ssize_t pmcraid_show_adapter_id(
 static struct device_attribute pmcraid_adapter_id_attr = {
         .attr = {
                  .name = "adapter_id",
-                 .mode = S_IRUGO | S_IWUSR,
+                 .mode = S_IRUGO,
                  },
         .show = pmcraid_show_adapter_id,
 };
diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c
index 4e059ea78d4c..89592c0b9151 100644
--- a/drivers/staging/speakup/speakup_dtlk.c
+++ b/drivers/staging/speakup/speakup_dtlk.c
@@ -325,7 +325,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth)
 
 static int synth_probe(struct spk_synth *synth)
 {
-                unsigned int port_val = 0;
+        unsigned int port_val = 0;
         int i = 0;
         struct synth_settings *sp;
 
@@ -361,7 +361,8 @@ static int synth_probe(struct spk_synth *synth)
         port_val &= 0xfbff;
         if (port_val != 0x107f) {
                 pr_info("DoubleTalk PC: not found\n");
-                synth_release_region(synth_lpc, SYNTH_IO_EXTENT);
+                if (synth_lpc)
+                        synth_release_region(synth_lpc, SYNTH_IO_EXTENT);
                 return -ENODEV;
         }
         while (inw_p(synth_lpc) != 0x147f)
@@ -369,7 +370,7 @@ static int synth_probe(struct spk_synth *synth)
         sp = synth_interrogate(synth);
         pr_info("%s: %03x-%03x, ROM ver %s, s/n %u, driver: %s\n",
                 synth->long_name, synth_lpc, synth_lpc+SYNTH_IO_EXTENT - 1,
-         sp->rom_version, sp->serial_number, synth->version);
+                sp->rom_version, sp->serial_number, synth->version);
         synth->alive = 1;
         return 0;
 }