diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 18:57:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-10 18:57:15 -0800 |
| commit | 29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa (patch) | |
| tree | b4065a69fc2baa5f721b9e3ca05e3934e1ea6693 /drivers | |
| parent | 1d9c5d79e6e4385aea6f69c23ba543717434ed70 (diff) | |
| parent | edb0ec0725bb9797ded0deaf172a6795e43795c8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree changes from Jiri Kosina:
"Patches from trivial.git that keep the world turning around.
Mostly documentation and comment fixes, and a two corner-case code
fixes from Alan Cox"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
kexec, Kconfig: spell "architecture" properly
mm: fix cleancache debugfs directory path
blackfin: mach-common: ints-priority: remove unused function
doubletalk: probe failure causes OOPS
ARM: cache-l2x0.c: Make it clear that cache-l2x0 handles L310 cache controller
msdos_fs.h: fix 'fields' in comment
scsi: aic7xxx: fix comment
ARM: l2c: fix comment
ibmraid: fix writeable attribute with no store method
dynamic_debug: fix comment
doc: usbmon: fix spelling s/unpriviledged/unprivileged/
x86: init_mem_mapping(): use capital BIOS in comment
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_core.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/pmcraid.c | 2 | ||||
| -rw-r--r-- | drivers/staging/speakup/speakup_dtlk.c | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c index 0bcacf71aef..97f2accd3db 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 8c27b6a77ec..85510086a36 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 4e059ea78d4..89592c0b915 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; } |