View | Details | Raw Unified | Return to bug 42815 | Differences between
and this patch

Collapse All | Expand All

(-)staging/drivers/staging/rtl8712/os_intfs.c (-3 lines)
Lines 477-485 static int netdev_close(struct net_devic Link Here
477 
	r8712_free_network_queue(padapter);
 477 
	r8712_free_network_queue(padapter);
478 
	/* The interface is no longer Up: */
 478 
	/* The interface is no longer Up: */
479 
	padapter->bup = false;
 479 
	padapter->bup = false;
480 
	release_firmware(padapter->fw);
481 
	/* never exit with a firmware callback pending */
482 
	wait_for_completion(&padapter->rtl8712_fw_ready);
483 
	return 0;
 480 
	return 0;
484 
}
 481 
}
485 

          482
          

        



(-)staging/drivers/staging/rtl8712/usb_intf.c
      (+5 lines)




  

    
      
            Lines 30-35
          
      
      
        Link Here
      
    
  

        

          30
          

          30
          

        

        

          31
          
#include <linux/usb.h>

          31
          
#include <linux/usb.h>

        

        

          32
          
#include <linux/module.h>

          32
          
#include <linux/module.h>

        

            

              
              
              33
              
#include <linux/firmware.h>

            

        

          33
          

          34
          

        

        

          34
          
#include "osdep_service.h"

          35
          
#include "osdep_service.h"

        

        

          35
          
#include "drv_types.h"

          36
          
#include "drv_types.h"

        

  

    
      
            Lines 620-625
          static void r871xu_dev_remove(struct usb
      
      
        Link Here
      
    
  

        

          620
          
	struct _adapter *padapter = netdev_priv(pnetdev);

          621
          
	struct _adapter *padapter = netdev_priv(pnetdev);

        

        

          621
          
	struct usb_device *udev = interface_to_usbdev(pusb_intf);

          622
          
	struct usb_device *udev = interface_to_usbdev(pusb_intf);

        

        

          622
          

          623
          

        

            

              
              
              624
              
	if (padapter->fw_found)

            

            

              625
              
		release_firmware(padapter->fw);

            

            

              626
              
	/* never exit with a firmware callback pending */

            

            

              627
              
	wait_for_completion(&padapter->rtl8712_fw_ready);

            

        

          623
          
	usb_set_intfdata(pusb_intf, NULL);

          628
          
	usb_set_intfdata(pusb_intf, NULL);

        

        

          624
          
	if (padapter) {

          629
          
	if (padapter) {

        

        

          625
          
		if (drvpriv.drv_registered == true)

          630
          
		if (drvpriv.drv_registered == true)

        






  

  Return to bug 42815