From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 2 Feb 2011 21:35:58 +0000 (-0800)
Subject: Staging: Merge branch 'staging-next' into 2.6.38-rc3
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=949c3676cd6b2717c2abda5d9b10e6d6d7daf741;p=linux-edison.git

Staging: Merge branch 'staging-next' into 2.6.38-rc3

This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
	drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
	drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

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

949c3676cd6b2717c2abda5d9b10e6d6d7daf741
diff --cc drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 65057329c99,f1235884cc5..add00462bc5
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@@ -1154,13 -1187,11 +1157,11 @@@ static void wl_remove(struct pci_dev *p
  }
  
  static struct pci_driver wl_pci_driver = {
- 	.name  = KBUILD_MODNAME,
 -	.name = "brcm80211",
--	.probe = wl_pci_probe,
- #ifdef LINUXSTA_PS
--	.suspend = wl_suspend,
- 	.resume  = wl_resume,
- #endif				/* LINUXSTA_PS */
 -	.resume = wl_resume,
 -	.remove = __devexit_p(wl_remove),
++	.name     = KBUILD_MODNAME,
++	.probe    = wl_pci_probe,
++	.suspend  = wl_suspend,
++	.resume   = wl_resume,
 +	.remove   = __devexit_p(wl_remove),
  	.id_table = wl_id_table,
  };
  
diff --cc drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
index fa1ee9d1188,80183a7e662..51b4a79e4b8
--- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
+++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c
@@@ -1001,14 -997,21 +995,19 @@@ static int __devinit synaptics_rmi4_pro
  	if (retval) {
  		dev_err(&client->dev, "%s:Unable to get attn irq %d\n",
  				__func__, platformdata->irq_number);
- 		goto err_request_irq;
 -		goto err_unset_clientdata;
++		goto err_query_dev;
+ 	}
+ 
+ 	retval = input_register_device(rmi4_data->input_dev);
+ 	if (retval) {
+ 		dev_err(&client->dev, "%s:input register failed\n", __func__);
+ 		goto err_free_irq;
  	}
  
  	return retval;
  
- err_request_irq:
+ err_free_irq:
  	free_irq(platformdata->irq_number, rmi4_data);
- 	input_unregister_device(rmi4_data->input_dev);
 -err_unset_clientdata:
 -	i2c_set_clientdata(client, NULL);
  err_query_dev:
  	if (platformdata->regulator_en) {
  		regulator_disable(rmi4_data->regulator);