diff options
Diffstat (limited to 'arch/cris/arch-v32/drivers')
| -rw-r--r-- | arch/cris/arch-v32/drivers/cryptocop.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/pci/bios.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/drivers/sync_serial.c | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/drivers/cryptocop.c b/arch/cris/arch-v32/drivers/cryptocop.c index 2081d8b45f06..b5698c876fcc 100644 --- a/arch/cris/arch-v32/drivers/cryptocop.c +++ b/arch/cris/arch-v32/drivers/cryptocop.c @@ -1210,7 +1210,7 @@ static int cryptocop_setup_dma_list(struct cryptocop_operation *operation, struc assert(active_count >= eop_needed_count); assert((eop_needed_count == 0) || (eop_needed_count == 1)); if (eop_needed_count) { - /* This means that the bulk operation (cipeher/m2m) is terminated. */ + /* This means that the bulk operation (cipher/m2m) is terminated. */ if (active_count > 1) { /* Use zero length EOP descriptor. */ struct cryptocop_dma_desc *ed = alloc_cdesc(alloc_flag); diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c index 64a5fb93767d..212266a2c5d9 100644 --- a/arch/cris/arch-v32/drivers/pci/bios.c +++ b/arch/cris/arch-v32/drivers/pci/bios.c @@ -1,6 +1,6 @@ #include <linux/pci.h> #include <linux/kernel.h> -#include <arch/hwregs/intr_vect.h> +#include <hwregs/intr_vect.h> void pcibios_fixup_bus(struct pci_bus *b) { diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c index e989cee77414..ef515af1a377 100644 --- a/arch/cris/arch-v32/drivers/sync_serial.c +++ b/arch/cris/arch-v32/drivers/sync_serial.c @@ -1627,6 +1627,12 @@ static int __init etrax_sync_serial_init(void) /* Create a sysfs class for syncser */ syncser_class = class_create(THIS_MODULE, "syncser_class"); + if (IS_ERR(syncser_class)) { + pr_err("Failed to create a sysfs class for syncser\n"); + unregister_chrdev_region(syncser_first, minor_count); + cdev_del(syncser_cdev); + return -1; + } /* Initialize Ports */ #if defined(CONFIG_ETRAX_SYNCHRONOUS_SERIAL_PORT0) |
