Index: chromeos/compat-wireless/drivers/net/wireless/ipw2x00/ipw2100.c |
diff --git a/chromeos/compat-wireless/drivers/net/wireless/ipw2x00/ipw2100.c b/chromeos/compat-wireless/drivers/net/wireless/ipw2x00/ipw2100.c |
index a0e4158db09a1df484885919562faca84456857c..fa14e9ea334c97c8e15ab65fd9e27181940374f6 100644 |
--- a/chromeos/compat-wireless/drivers/net/wireless/ipw2x00/ipw2100.c |
+++ b/chromeos/compat-wireless/drivers/net/wireless/ipw2x00/ipw2100.c |
@@ -2740,14 +2740,6 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv) |
packet = &priv->rx_buffers[i]; |
- /* Sync the DMA for the STATUS buffer so CPU is sure to get |
- * the correct values */ |
- pci_dma_sync_single_for_cpu(priv->pci_dev, |
- sq->nic + |
- sizeof(struct ipw2100_status) * i, |
- sizeof(struct ipw2100_status), |
- PCI_DMA_FROMDEVICE); |
- |
/* Sync the DMA for the RX buffer so CPU is sure to get |
* the correct values */ |
pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr, |
@@ -6686,20 +6678,21 @@ static int __init ipw2100_init(void) |
printk(KERN_INFO DRV_NAME ": %s, %s\n", DRV_DESCRIPTION, DRV_VERSION); |
printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT); |
- ret = pci_register_driver(&ipw2100_pci_driver); |
- if (ret) |
- goto out; |
- |
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) |
pm_qos_add_request(&ipw2100_pm_qos_req, PM_QOS_CPU_DMA_LATENCY, |
PM_QOS_DEFAULT_VALUE); |
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) |
- ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY, |
- PM_QOS_DEFAULT_VALUE); |
+ ipw2100_pm_qos_req = pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY, |
+ PM_QOS_DEFAULT_VALUE); |
#else |
pm_qos_add_requirement(PM_QOS_CPU_DMA_LATENCY, "ipw2100", |
PM_QOS_DEFAULT_VALUE); |
#endif |
+ |
+ ret = pci_register_driver(&ipw2100_pci_driver); |
+ if (ret) |
+ goto out; |
+ |
#ifdef CONFIG_IPW2100_DEBUG |
ipw2100_debug_level = debug; |
ret = driver_create_file(&ipw2100_pci_driver.driver, |