From 5a0ccb6b8ad3a769a69d09a0bbe6e55d96ebcb04 Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 20 Jan 2015 12:08:50 +0000 Subject: ibmraid: fix writeable attribute with no store method https://bugzilla.kernel.org/show_bug.cgi?id=81311 [ 0.603157] WARNING: at drivers/base/core.c:601 device_create_file+0x8d/0xa0() [ 0.603158] Attribute adapter_id: write permission without 'store' [ 0.603159] Modules linked in: i915(+) i2c_algo_bit drm_kms_helper drm mpt2sas(+) pmcraid(+) raid_class scsi_transport_sas i2c_core video Signed-off-by: Alan Cox Signed-off-by: Jiri Kosina --- drivers/scsi/pmcraid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index bcb64eb1387..4d28072d661 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c @@ -4292,7 +4292,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, }; -- cgit v1.2.3-70-g09d2 From a7870c0f26afa5c2c5054528975b9ca56b399309 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 27 Nov 2014 12:05:45 +0100 Subject: scsi: aic7xxx: fix comment Signed-off-by: Geert Uytterhoeven Cc: Hannes Reinecke Cc: linux-scsi@vger.kernel.org Signed-off-by: Jiri Kosina --- drivers/scsi/aic7xxx/aic79xx_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') 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) { -- cgit v1.2.3-70-g09d2 From 7aa4d5c8ffed00ff751f1d8d492ae89d7f3f9736 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 15 Dec 2014 11:33:08 +0000 Subject: doubletalk: probe failure causes OOPS The code bothers to probe for the device, but on failing to find it proceeds to try and release a NULL resource, thereby ruining it's prior good behaviour Resolves-Bug: https://bugzilla.kernel.org/show_bug.cgi?id=88581 Signed-off-by: Alan Cox Signed-off-by: Jiri Kosina --- drivers/staging/speakup/speakup_dtlk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c index d7d51527389..ffd85e1a885 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; } -- cgit v1.2.3-70-g09d2