Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Side by Side Diff: chromeos/compat-wireless/drivers/net/wireless/p54/p54pci.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 1
2 /* 2 /*
3 * Linux device driver for PCI based Prism54 3 * Linux device driver for PCI based Prism54
4 * 4 *
5 * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net> 5 * Copyright (c) 2006, Michael Wu <flamingice@sourmilk.net>
6 * Copyright (c) 2008, Christian Lamparter <chunkeey@web.de> 6 * Copyright (c) 2008, Christian Lamparter <chunkeey@web.de>
7 * 7 *
8 * Based on the islsm (softmac prism54) driver, which is: 8 * Based on the islsm (softmac prism54) driver, which is:
9 * Copyright 2004-2006 Jean-Baptiste Note <jean-baptiste.note@m4x.org>, et al. 9 * Copyright 2004-2006 Jean-Baptiste Note <jean-baptiste.note@m4x.org>, et al.
10 * 10 *
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 459
460 P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT)); 460 P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
461 P54P_READ(int_enable); 461 P54P_READ(int_enable);
462 wmb(); 462 wmb();
463 udelay(10); 463 udelay(10);
464 464
465 P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET)); 465 P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
466 P54P_READ(dev_int); 466 P54P_READ(dev_int);
467 467
468 if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) { 468 if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
469 » » wiphy_err(dev->wiphy, "cannot boot firmware!\n"); 469 » » wiphy_err(dev->wiphy, "Cannot boot firmware!\n");
470 p54p_stop(dev); 470 p54p_stop(dev);
471 return -ETIMEDOUT; 471 return -ETIMEDOUT;
472 } 472 }
473 473
474 P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE)); 474 P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
475 P54P_READ(int_enable); 475 P54P_READ(int_enable);
476 wmb(); 476 wmb();
477 udelay(10); 477 udelay(10);
478 478
479 P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE)); 479 P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 return pci_register_driver(&p54p_driver); 668 return pci_register_driver(&p54p_driver);
669 } 669 }
670 670
671 static void __exit p54p_exit(void) 671 static void __exit p54p_exit(void)
672 { 672 {
673 pci_unregister_driver(&p54p_driver); 673 pci_unregister_driver(&p54p_driver);
674 } 674 }
675 675
676 module_init(p54p_init); 676 module_init(p54p_init);
677 module_exit(p54p_exit); 677 module_exit(p54p_exit);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698