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

Commit 2f2c7795 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
  ctcm: rename READ/WRITE defines to avoid redefinitions
  claw: rename READ/WRITE defines to avoid redefinitions
  phylib: available for any speed ethernet
  can: add limit for nframes and clean up signed/unsigned variables
  pkt_sched: Check .walk and .leaf class handlers
  pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
  caif-spi: Bugfix SPI_DATA_POS settings were inverted.
  caif: Bugfix - Increase default headroom size for control channel.
  net: make netpoll_rx return bool for !CONFIG_NETPOLL
  Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size
  Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM
  Bluetooth: Change default L2CAP ERTM retransmit timeout
  Bluetooth: Fix endianness issue with L2CAP MPS configuration
  net: Use NET_XMIT_SUCCESS where possible.
  isdn: mISDN: call pci_disable_device() if pci_probe() failed
  isdn: avm: call pci_disable_device() if pci_probe() failed
  isdn: avm: call pci_disable_device() if pci_probe() failed
  usbnet: rx_submit() should return an error code.
  pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles
  pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles
  ...
parents 2897c684 3c09e264

drivers/isdn/hardware/avm/c4.c

+1 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,7 @@ static int __devinit c4_probe(struct pci_dev *dev, 
	if (retval != 0) {

		printk(KERN_ERR "c4: no AVM-C%d at i/o %#x, irq %d detected, mem %#x\n",

		       nr, param.port, param.irq, param.membase);

		pci_disable_device(dev);

		return -ENODEV;

	}

	return 0;

drivers/isdn/hardware/avm/t1pci.c

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ static int __devinit t1pci_probe(struct pci_dev *dev, 
	if (retval != 0) {

		printk(KERN_ERR "t1pci: no AVM-T1-PCI at i/o %#x, irq %d detected, mem %#x\n",

		       param.port, param.irq, param.membase);

		pci_disable_device(dev);

		return -ENODEV;

	}

	return 0;

drivers/isdn/hardware/mISDN/mISDNinfineon.c

+4 −1
Original line number Diff line number Diff line
@@ -1094,6 +1094,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		pr_info("mISDN: do not have informations about adapter at %s\n",

			pci_name(pdev));

		kfree(card);

		pci_disable_device(pdev);

		return -EINVAL;

	} else

		pr_notice("mISDN: found adapter %s at %s\n",
@@ -1103,7 +1104,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	pci_set_drvdata(pdev, card);

	err = setup_instance(card);

	if (err) {

		pci_disable_device(card->pdev);

		pci_disable_device(pdev);

		kfree(card);

		pci_set_drvdata(pdev, NULL);

	} else if (ent->driver_data == INF_SCT_1) {
@@ -1114,6 +1115,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			sc = kzalloc(sizeof(struct inf_hw), GFP_KERNEL);

			if (!sc) {

				release_card(card);

				pci_disable_device(pdev);

				return -ENOMEM;

			}

			sc->irq = card->irq;
@@ -1121,6 +1123,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
			sc->ci = card->ci + i;

			err = setup_instance(sc);

			if (err) {

				pci_disable_device(pdev);

				kfree(sc);

				release_card(card);

				break;

drivers/net/caif/caif_spi_slave.c

+2 −2
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 
#include <net/caif/caif_spi.h>



#ifndef CONFIG_CAIF_SPI_SYNC

#define SPI_DATA_POS SPI_CMD_SZ

#define SPI_DATA_POS 0

static inline int forward_to_spi_cmd(struct cfspi *cfspi)

{

	return cfspi->rx_cpck_len;

}

#else

#define SPI_DATA_POS 0

#define SPI_DATA_POS SPI_CMD_SZ

static inline int forward_to_spi_cmd(struct cfspi *cfspi)

{

	return 0;

drivers/net/phy/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
menuconfig PHYLIB

	tristate "PHY Device support and infrastructure"

	depends on !S390

	depends on NET_ETHERNET

	depends on NETDEVICES

	help

	  Ethernet controllers are usually attached to PHY

	  devices.  This option provides infrastructure for