Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de9e24ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging tree fixes from Greg Kroah-Hartman:
 "Here are some tiny drivers/staging/ bugfixes.  Some build fixes that
  were recently reported, as well as one kfree bug that is hitting a
  number of users."

* tag 'staging-3.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: ozwpan: Fix bug where kfree is called twice.
  staging: octeon-ethernet: fix build errors by including interrupt.h
  staging: zcache: fix Kconfig crypto dependency
  staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS
parents 8d7d1adc 89f21cc0

drivers/staging/octeon/ethernet-rx.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/prefetch.h>

#include <linux/ratelimit.h>

#include <linux/smp.h>

#include <linux/interrupt.h>

#include <net/dst.h>

#ifdef CONFIG_XFRM

#include <linux/xfrm.h>

drivers/staging/octeon/ethernet-tx.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/ip.h>

#include <linux/ratelimit.h>

#include <linux/string.h>

#include <linux/interrupt.h>

#include <net/dst.h>

#ifdef CONFIG_XFRM

#include <linux/xfrm.h>

drivers/staging/octeon/ethernet.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/etherdevice.h>

#include <linux/phy.h>

#include <linux/slab.h>

#include <linux/interrupt.h>



#include <net/dst.h>

drivers/staging/ozwpan/ozpd.c

+0 −2
Original line number Diff line number Diff line
@@ -383,8 +383,6 @@ static void oz_tx_frame_free(struct oz_pd *pd, struct oz_tx_frame *f) 
		pd->tx_pool = &f->link;

		pd->tx_pool_count++;

		f = 0;

	} else {

		kfree(f);

	}

	spin_unlock_bh(&pd->tx_frame_lock);

	if (f)

drivers/staging/tidspbridge/core/tiomap3430.c

+12 −8
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ 
#define OMAP343X_CONTROL_IVA2_BOOTADDR (OMAP2_CONTROL_GENERAL + 0x0190)

#define OMAP343X_CONTROL_IVA2_BOOTMOD (OMAP2_CONTROL_GENERAL + 0x0194)



#define OMAP343X_CTRL_REGADDR(reg) \

	OMAP2_L4_IO_ADDRESS(OMAP343X_CTRL_BASE + (reg))





/* Forward Declarations: */

static int bridge_brd_monitor(struct bridge_dev_context *dev_ctxt);

static int bridge_brd_read(struct bridge_dev_context *dev_ctxt,
@@ -418,19 +414,27 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt, 


		/* Assert RST1 i.e only the RST only for DSP megacell */

		if (!status) {

			/*

			 * XXX: ioremapping  MUST be removed once ctrl

			 * function is made available.

			 */

			void __iomem *ctrl = ioremap(OMAP343X_CTRL_BASE, SZ_4K);

			if (!ctrl)

				return -ENOMEM;



			(*pdata->dsp_prm_rmw_bits)(OMAP3430_RST1_IVA2_MASK,

					OMAP3430_RST1_IVA2_MASK, OMAP3430_IVA2_MOD,

					OMAP2_RM_RSTCTRL);

			/* Mask address with 1K for compatibility */

			__raw_writel(dsp_addr & OMAP3_IVA2_BOOTADDR_MASK,

					OMAP343X_CTRL_REGADDR(

					OMAP343X_CONTROL_IVA2_BOOTADDR));

					ctrl + OMAP343X_CONTROL_IVA2_BOOTADDR);

			/*

			 * Set bootmode to self loop if dsp_debug flag is true

			 */

			__raw_writel((dsp_debug) ? OMAP3_IVA2_BOOTMOD_IDLE : 0,

					OMAP343X_CTRL_REGADDR(

					OMAP343X_CONTROL_IVA2_BOOTMOD));

					ctrl + OMAP343X_CONTROL_IVA2_BOOTMOD);



			iounmap(ctrl);

		}

	}

	if (!status) {