summaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-18 14:04:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-18 14:04:51 -0400
commitd5acba26bfa097a618be425522b1ec4269d3edaf (patch)
tree7abb08032d4b79b34eb1386aa007a811e1964839 /drivers/parport
parent2475c515d4031c494ff452508a8bf8c281ec6e56 (diff)
parent128f38041035001276e964cda1cf951f218d965d (diff)
Merge tag 'char-misc-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the bit set of char/misc drivers for 4.19-rc1 There is a lot here, much more than normal, seems like everyone is writing new driver subsystems these days... Anyway, major things here are: - new FSI driver subsystem, yet-another-powerpc low-level hardware bus - gnss, finally an in-kernel GPS subsystem to try to tame all of the crazy out-of-tree drivers that have been floating around for years, combined with some really hacky userspace implementations. This is only for GNSS receivers, but you have to start somewhere, and this is great to see. Other than that, there are new slimbus drivers, new coresight drivers, new fpga drivers, and loads of DT bindings for all of these and existing drivers. All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (255 commits) android: binder: Rate-limit debug and userspace triggered err msgs fsi: sbefifo: Bump max command length fsi: scom: Fix NULL dereference misc: mic: SCIF Fix scif_get_new_port() error handling misc: cxl: changed asterisk position genwqe: card_base: Use true and false for boolean values misc: eeprom: assignment outside the if statement uio: potential double frees if __uio_register_device() fails eeprom: idt_89hpesx: clean up an error pointer vs NULL inconsistency misc: ti-st: Fix memory leak in the error path of probe() android: binder: Show extra_buffers_size in trace firmware: vpd: Fix section enabled flag on vpd_section_destroy platform: goldfish: Retire pdev_bus goldfish: Use dedicated macros instead of manual bit shifting goldfish: Add missing includes to goldfish.h mux: adgs1408: new driver for Analog Devices ADGS1408/1409 mux dt-bindings: mux: add adi,adgs1408 Drivers: hv: vmbus: Cleanup synic memory free path Drivers: hv: vmbus: Remove use of slow_virt_to_phys() Drivers: hv: vmbus: Reset the channel callback in vmbus_onoffer_rescind() ...
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/ieee1284.c3
-rw-r--r--drivers/parport/parport_sunbpp.c8
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/parport/ieee1284.c b/drivers/parport/ieee1284.c
index 2d1a5c737c6e..f12b9da69255 100644
--- a/drivers/parport/ieee1284.c
+++ b/drivers/parport/ieee1284.c
@@ -267,7 +267,7 @@ static void parport_ieee1284_terminate (struct parport *port)
267 port->ieee1284.phase = IEEE1284_PH_FWD_IDLE; 267 port->ieee1284.phase = IEEE1284_PH_FWD_IDLE;
268 } 268 }
269 269
270 /* fall-though.. */ 270 /* fall through */
271 271
272 default: 272 default:
273 /* Terminate from all other modes. */ 273 /* Terminate from all other modes. */
@@ -615,6 +615,7 @@ ssize_t parport_write (struct parport *port, const void *buffer, size_t len)
615 case IEEE1284_MODE_NIBBLE: 615 case IEEE1284_MODE_NIBBLE:
616 case IEEE1284_MODE_BYTE: 616 case IEEE1284_MODE_BYTE:
617 parport_negotiate (port, IEEE1284_MODE_COMPAT); 617 parport_negotiate (port, IEEE1284_MODE_COMPAT);
618 /* fall through */
618 case IEEE1284_MODE_COMPAT: 619 case IEEE1284_MODE_COMPAT:
619 DPRINTK (KERN_DEBUG "%s: Using compatibility mode\n", 620 DPRINTK (KERN_DEBUG "%s: Using compatibility mode\n",
620 port->name); 621 port->name);
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index 01cf1c1a841a..8de329546b82 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -286,12 +286,16 @@ static int bpp_probe(struct platform_device *op)
286 286
287 ops = kmemdup(&parport_sunbpp_ops, sizeof(struct parport_operations), 287 ops = kmemdup(&parport_sunbpp_ops, sizeof(struct parport_operations),
288 GFP_KERNEL); 288 GFP_KERNEL);
289 if (!ops) 289 if (!ops) {
290 err = -ENOMEM;
290 goto out_unmap; 291 goto out_unmap;
292 }
291 293
292 dprintk(("register_port\n")); 294 dprintk(("register_port\n"));
293 if (!(p = parport_register_port((unsigned long)base, irq, dma, ops))) 295 if (!(p = parport_register_port((unsigned long)base, irq, dma, ops))) {
296 err = -ENOMEM;
294 goto out_free_ops; 297 goto out_free_ops;
298 }
295 299
296 p->size = size; 300 p->size = size;
297 p->dev = &op->dev; 301 p->dev = &op->dev;