Staging: Merge staging-next into Linus's tree

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/batman-adv/bat_sysfs.c
	drivers/staging/batman-adv/device.c
	drivers/staging/batman-adv/hard-interface.c
	drivers/staging/cx25821/cx25821-audups11.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 6 insertions, 4 deletions

diff --git a/drivers/staging/octeon/cvmx-cmd-queue.c b/drivers/staging/octeon/cvmx-cmd-queue.c
index 976227b0127..e9809d37516 100644
--- a/drivers/staging/octeon/cvmx-cmd-queue.c
+++ b/drivers/staging/octeon/cvmx-cmd-queue.c
@@ -140,21 +140,21 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id,
         if (qstate->base_ptr_div128) {
                 if (max_depth != (int)qstate->max_depth) {
                         cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
-                                "Queue already initalized with different "
+                                "Queue already initialized with different "
                                 "max_depth (%d).\n",
                              (int)qstate->max_depth);
                         return CVMX_CMD_QUEUE_INVALID_PARAM;
                 }
                 if (fpa_pool != qstate->fpa_pool) {
                         cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
-                                "Queue already initalized with different "
+                                "Queue already initialized with different "
                                 "FPA pool (%u).\n",
                              qstate->fpa_pool);
                         return CVMX_CMD_QUEUE_INVALID_PARAM;
                 }
                 if ((pool_size >> 3) - 1 != qstate->pool_size_m1) {
                         cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
-                                "Queue already initalized with different "
+                                "Queue already initialized with different "
                                 "FPA pool size (%u).\n",
                              (qstate->pool_size_m1 + 1) << 3);
                         return CVMX_CMD_QUEUE_INVALID_PARAM;
diff --git a/drivers/staging/octeon/cvmx-fau.h b/drivers/staging/octeon/cvmx-fau.h
index 29bdce66cdf..a6939fc8ba1 100644
--- a/drivers/staging/octeon/cvmx-fau.h
+++ b/drivers/staging/octeon/cvmx-fau.h
@@ -299,7 +299,7 @@ cvmx_fau_tagwait_fetch_and_add8(cvmx_fau_reg_8_t reg, int8_t value)
 /**
  * Builds I/O data for async operations
  *
- * @scraddr: Scratch pad byte addres to write to.  Must be 8 byte aligned
+ * @scraddr: Scratch pad byte address to write to.  Must be 8 byte aligned
  * @value:   Signed value to add.
  *                Note: When performing 32 and 64 bit access, only the low
  *                22 bits are available.
diff --git a/drivers/staging/octeon/ethernet-spi.c b/drivers/staging/octeon/ethernet-spi.c
index b58b8971f93..97082542188 100644
--- a/drivers/staging/octeon/ethernet-spi.c
+++ b/drivers/staging/octeon/ethernet-spi.c
@@ -294,6 +294,8 @@ int cvm_oct_spi_init(struct net_device *dev)
         if (number_spi_ports == 0) {
                 r = request_irq(OCTEON_IRQ_RML, cvm_oct_spi_rml_interrupt,
                                 IRQF_SHARED, "SPI", &number_spi_ports);
+                if (r)
+                        return r;
         }
         number_spi_ports++;