From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 13 Apr 2011 19:14:05 +0000 (-0700)
Subject: Staging: merge 2.6.39-rc3 into staging-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=32235b07b52e948900613e27c5cbd955d084ae8a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Staging: merge 2.6.39-rc3 into staging-next

This was done to handle a number of conflicts, the majority of which
were caused by the big "fix spelling issues" patch.

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

32235b07b52e948900613e27c5cbd955d084ae8a
diff --cc drivers/staging/hv/hv_util.c
index 3af0a11d6780,2df15683f8fa..8038589e2c05
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@@ -78,8 -79,8 +78,8 @@@ static void shutdown_onchannelcallback(
  				icmsghdrp->status = HV_S_OK;
  				execute_shutdown = true;
  
 -				DPRINT_INFO(VMBUS, "Shutdown request received -"
 -					    " graceful shutdown initiated");
 +				pr_info("Shutdown request received -"
- 					    " gracefull shutdown initiated\n");
++					    " graceful shutdown initiated\n");
  				break;
  			default:
  				icmsghdrp->status = HV_E_FAIL;
diff --cc drivers/staging/hv/netvsc_drv.c
index 54a203ba1de5,33973568214f..258233d0d5de
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@@ -214,10 -220,11 +215,11 @@@ static void netvsc_linkstatus_callback(
  				       unsigned int status)
  {
  	struct net_device *net = dev_get_drvdata(&device_obj->device);
+ 	struct net_device_context *ndev_ctx;
  
  	if (!net) {
 -		DPRINT_ERR(NETVSC_DRV, "got link status but net device "
 -				"not initialized yet");
 +		netdev_err(net, "got link status but net device "
 +				"not initialized yet\n");
  		return;
  	}
  
diff --cc drivers/staging/hv/rndis_filter.c
index 16787052a11f,048376b2b676..6305050f9e8d
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@@ -578,10 -583,9 +578,10 @@@ static int rndis_filter_set_packet_filt
  		msecs_to_jiffies(2000));
  	if (request->wait_condition == 0) {
  		ret = -1;
 -		DPRINT_ERR(NETVSC, "timeout before we got a set response...");
 +		dev_err(&dev->net_dev->dev->device,
 +			"timeout before we got a set response...\n");
  		/*
- 		 * We cant deallocate the request since we may still receive a
+ 		 * We can't deallocate the request since we may still receive a
  		 * send completion for it.
  		 */
  		goto Exit;
diff --cc drivers/staging/hv/vmbus_drv.c
index 501ab369abbd,79089f85d903..c944450c6f09
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@@ -527,8 -254,10 +527,8 @@@ static int vmbus_on_isr(void
  	event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
  
  	/* Since we are a child, we only need to check bit 0 */
- 	if (test_and_clear_bit(0, (unsigned long *) &event->flags32[0]))
 -	if (sync_test_and_clear_bit(0, (unsigned long *) &event->flags32[0])) {
 -		DPRINT_DBG(VMBUS, "received event %d", event->flags32[0]);
++	if (sync_test_and_clear_bit(0, (unsigned long *) &event->flags32[0]))
  		ret |= 0x2;
 -	}
  
  	return ret;
  }