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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  net: libertas sdio driver
  mmc: at91_mci: cleanup: use MCI_ERRORS
  mmc: possible leak in mmc_read_ext_csd
parents d20ead9e 727c26ed

drivers/mmc/core/mmc.c

+2 −1
Original line number Diff line number Diff line
@@ -213,7 +213,8 @@ static int mmc_read_ext_csd(struct mmc_card *card) 
		printk(KERN_ERR "%s: unrecognised EXT_CSD structure "

			"version %d\n", mmc_hostname(card->host),

			ext_csd_struct);

		return -EINVAL;

		err = -EINVAL;

		goto out;

	}



	if (ext_csd_struct >= 2) {

drivers/mmc/host/at91_mci.c

+1 −3
Original line number Diff line number Diff line
@@ -581,9 +581,7 @@ static void at91_mci_completed_command(struct at91mci_host *host) 
	pr_debug("Status = %08X [%08X %08X %08X %08X]\n",

		 status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);



	if (status & (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE |

			AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE |

			AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)) {

	if (status & AT91_MCI_ERRORS) {

		if ((status & AT91_MCI_RCRCE) && !(mmc_resp_type(cmd) & MMC_RSP_CRC)) {

			cmd->error = 0;

		}

drivers/net/wireless/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -282,6 +282,12 @@ config LIBERTAS_CS 
	---help---

	  A driver for Marvell Libertas 8385 CompactFlash devices.



config LIBERTAS_SDIO

	tristate "Marvell Libertas 8385 and 8686 SDIO 802.11b/g cards"

	depends on LIBERTAS && MMC

	---help---

	  A driver for Marvell Libertas 8385 and 8686 SDIO devices.



config LIBERTAS_DEBUG

	bool "Enable full debugging output in the Libertas module."

	depends on LIBERTAS

drivers/net/wireless/libertas/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ libertas-objs := main.o wext.o \ 


usb8xxx-objs += if_usb.o

libertas_cs-objs += if_cs.o

libertas_sdio-objs += if_sdio.o



obj-$(CONFIG_LIBERTAS)     += libertas.o

obj-$(CONFIG_LIBERTAS_USB) += usb8xxx.o

obj-$(CONFIG_LIBERTAS_CS)  += libertas_cs.o

obj-$(CONFIG_LIBERTAS_SDIO) += libertas_sdio.o

drivers/net/wireless/libertas/defs.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define LBS_DEB_FW	0x00080000

#define LBS_DEB_THREAD	0x00100000

#define LBS_DEB_HEX	0x00200000

#define LBS_DEB_SDIO	0x00400000



extern unsigned int libertas_debug;
@@ -80,6 +81,7 @@ do { if ((libertas_debug & (grp)) == (grp)) \ 
#define lbs_deb_usbd(dev, fmt, args...) LBS_DEB_LL(LBS_DEB_USB, " usbd", "%s:" fmt, (dev)->bus_id, ##args)

#define lbs_deb_cs(fmt, args...)        LBS_DEB_LL(LBS_DEB_CS, " cs", fmt, ##args)

#define lbs_deb_thread(fmt, args...)    LBS_DEB_LL(LBS_DEB_THREAD, " thread", fmt, ##args)

#define lbs_deb_sdio(fmt, args...)      LBS_DEB_LL(LBS_DEB_SDIO, " thread", fmt, ##args)



#define lbs_pr_info(format, args...) \

	printk(KERN_INFO DRV_NAME": " format, ## args)