Changeset 15975


Ignore:
Timestamp:
2009-05-22T08:46:42+02:00 (9 years ago)
Author:
juhosg
Message:

[adm5120] integrate 2.6.28 specific patch into the usb driver

Location:
trunk/target/linux/adm5120
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/files/drivers/usb/host/adm5120-drv.c

    r15245 r15975  
    175175        .hub_status_data =      admhc_hub_status_data, 
    176176        .hub_control =          admhc_hub_control, 
    177         .hub_irq_enable =       admhc_hub_irq_enable, 
    178177#ifdef CONFIG_PM 
    179178        .bus_suspend =          admhc_bus_suspend, 
  • trunk/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c

    r15245 r15975  
    4747#include "../core/hub.h" 
    4848 
    49 #define DRIVER_VERSION  "0.25.0" 
     49#define DRIVER_VERSION  "0.27.0" 
    5050#define DRIVER_AUTHOR   "Gabor Juhos <juhosg@openwrt.org>" 
    5151#define DRIVER_DESC     "ADMtek USB 1.1 Host Controller Driver" 
  • trunk/target/linux/adm5120/files/drivers/usb/host/adm5120-hub.c

    r15245 r15975  
    6464/*-------------------------------------------------------------------------*/ 
    6565 
    66 /* hcd->hub_irq_enable() */ 
    67 static void admhc_hub_irq_enable(struct usb_hcd *hcd) 
    68 { 
    69         struct admhcd   *ahcd = hcd_to_admhcd(hcd); 
    70  
    71         spin_lock_irq(&ahcd->lock); 
    72         if (!ahcd->autostop) 
    73                 del_timer(&hcd->rh_timer);      /* Prevent next poll */ 
    74         admhc_intr_enable(ahcd, ADMHC_INTR_INSM); 
    75         spin_unlock_irq(&ahcd->lock); 
    76 } 
    77  
    78 /*-------------------------------------------------------------------------*/ 
    79  
    8066/* build "status change" packet (one or two bytes) from HC registers */ 
    8167 
  • trunk/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c

    r15245 r15975  
    433433                int any_connected) 
    434434{ 
    435         int     poll_rh = 1; 
    436  
    437         /* keep on polling until RHSC is enabled */ 
     435        /* If INSM is enabled, don't poll */ 
    438436        if (admhc_readl(ahcd, &ahcd->regs->int_enable) & ADMHC_INTR_INSM) 
    439                 poll_rh = 0; 
    440  
    441         return poll_rh; 
     437                return 0; 
     438 
     439        /* If no status changes are pending, enable status-change interrupts */ 
     440        if (!changed) { 
     441                admhc_intr_enable(ahcd, ADMHC_INTR_INSM); 
     442                return 0; 
     443        } 
     444 
     445        return 1; 
    442446} 
    443447 
Note: See TracChangeset for help on using the changeset viewer.