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

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

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (26 commits)
  staging: r8712u: Add new device IDs
  staging: brcm80211: fix suspend/resume issue in brcmsmac
  staging: brcm80211: remove assert to avoid panic since 2.6.37 kernel
  Staging: iio: Aditional fixpoint formatted output bugfix
  staging: usbip: vhci: use urb->dev->portnum to find port
  staging: usbip: vhci: handle EAGAIN from SO_RCVTIMEO
  staging: usbip: vhci: friendly log messages for connection errors
  staging: usbip: vhci: refuse to enqueue for dead connections
  staging: usbip: vhci: give back URBs from in-flight unlink requests
  staging: usbip: vhci: update reference count for usb_device
  staging: usbip: stub: update refcounts for devices and interfaces
  staging: tidspbridge: replace mbox callback with notifier_call
  staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card
  Staging: speakup: &&/|| confusion in silent_store()
  iio: Fixpoint formatted output bugfix
  staging: rt2860: Fix incorrect netif_stop_queue usage warning
  staging: r8712u: Fix memory leak in firmware loading
  staging: tidspbridge: configure full L1 MMU range
  staging: rt2870sta: Add ID for Linksys WUSB100v2
  Staging: xgfib: put parenthesis in the right place
  ...
parents abfa44b5 6b284053

drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ int PSSendOps(void *arg) 
        	status = 1;

        	goto complete;

    	}

        len = (firmware->size > MAX_BDADDR_FORMAT_LENGTH)? MAX_BDADDR_FORMAT_LENGTH: firmware->size;

	len = min(firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1);

	memcpy(config_bdaddr, firmware->data, len);

	config_bdaddr[len] = '\0';

	write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING);

drivers/staging/brcm80211/sys/wl_mac80211.c

+23 −22
Original line number Diff line number Diff line
@@ -209,11 +209,8 @@ static void wl_ops_stop(struct ieee80211_hw *hw) 
	struct wl_info *wl = hw->priv;

	ASSERT(wl);

	WL_LOCK(wl);

	wl_down(wl);

	ieee80211_stop_queues(hw);

	WL_UNLOCK(wl);



	return;

}



static int
@@ -246,7 +243,14 @@ wl_ops_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
static void

wl_ops_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

{

	return;

	struct wl_info *wl;



	wl = HW_TO_WL(hw);



	/* put driver in down state */

	WL_LOCK(wl);

	wl_down(wl);

	WL_UNLOCK(wl);

}



static int
@@ -1090,7 +1094,6 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return 0;

}



#ifdef LINUXSTA_PS

static int wl_suspend(struct pci_dev *pdev, pm_message_t state)

{

	struct wl_info *wl;
@@ -1105,11 +1108,12 @@ static int wl_suspend(struct pci_dev *pdev, pm_message_t state) 
		return -ENODEV;

	}



	/* only need to flag hw is down for proper resume */

	WL_LOCK(wl);

	wl_down(wl);

	wl->pub->hw_up = false;

	WL_UNLOCK(wl);

	pci_save_state(pdev, wl->pci_psstate);



	pci_save_state(pdev);

	pci_disable_device(pdev);

	return pci_set_power_state(pdev, PCI_D3hot);

}
@@ -1133,7 +1137,7 @@ static int wl_resume(struct pci_dev *pdev) 
	if (err)

		return err;



	pci_restore_state(pdev, wl->pci_psstate);

	pci_restore_state(pdev);



	err = pci_enable_device(pdev);

	if (err)
@@ -1145,13 +1149,12 @@ static int wl_resume(struct pci_dev *pdev) 
	if ((val & 0x0000ff00) != 0)

		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);



	WL_LOCK(wl);

	err = wl_up(wl);

	WL_UNLOCK(wl);



	/*

	*  done. driver will be put in up state

	*  in wl_ops_add_interface() call.

	*/

	return err;

}

#endif				/* LINUXSTA_PS */



static void wl_remove(struct pci_dev *pdev)

{
@@ -1186,10 +1189,8 @@ static void wl_remove(struct pci_dev *pdev) 
static struct pci_driver wl_pci_driver = {

	.name = "brcm80211",

	.probe = wl_pci_probe,

#ifdef LINUXSTA_PS

	.suspend = wl_suspend,

	.resume = wl_resume,

#endif				/* LINUXSTA_PS */

	.remove = __devexit_p(wl_remove),

	.id_table = wl_id_table,

};

drivers/staging/brcm80211/sys/wlc_mac80211.c

+0 −1
Original line number Diff line number Diff line
@@ -5126,7 +5126,6 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu, 
	fifo = prio2fifo[prio];



	ASSERT((uint) skb_headroom(sdu) >= TXOFF);

	ASSERT(!(sdu->cloned));

	ASSERT(!(sdu->next));

	ASSERT(!(sdu->prev));

	ASSERT(fifo < NFIFO);

drivers/staging/comedi/drivers/ni_labpc.c

+2 −1
Original line number Diff line number Diff line
@@ -575,7 +575,8 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase, 
	/* grab our IRQ */

	if (irq) {

		isr_flags = 0;

		if (thisboard->bustype == pci_bustype)

		if (thisboard->bustype == pci_bustype

		    || thisboard->bustype == pcmcia_bustype)

			isr_flags |= IRQF_SHARED;

		if (request_irq(irq, labpc_interrupt, isr_flags,

				driver_labpc.driver_name, dev)) {

drivers/staging/hv/blkvsc_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ static int blkvsc_probe(struct device *device) 
		blkdev->gd->first_minor = 0;

	blkdev->gd->fops = &block_ops;

	blkdev->gd->private_data = blkdev;

	blkdev->gd->driverfs_dev = &(blkdev->device_ctx->device);

	sprintf(blkdev->gd->disk_name, "hd%c", 'a' + devnum);



	blkvsc_do_inquiry(blkdev);