git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
irda
/
vlsi_ir.c
diff --git
a/drivers/net/irda/vlsi_ir.c
b/drivers/net/irda/vlsi_ir.c
index
006e4f5
..
97a49e0
100644
(file)
--- a/
drivers/net/irda/vlsi_ir.c
+++ b/
drivers/net/irda/vlsi_ir.c
@@
-473,8
+473,7
@@
static int vlsi_free_ring(struct vlsi_ring *r)
rd_set_addr_status(rd, 0, 0);
if (busaddr)
pci_unmap_single(r->pdev, busaddr, r->len, r->dir);
rd_set_addr_status(rd, 0, 0);
if (busaddr)
pci_unmap_single(r->pdev, busaddr, r->len, r->dir);
- if (rd->buf)
- kfree(rd->buf);
+ kfree(rd->buf);
}
kfree(r);
return 0;
}
kfree(r);
return 0;
@@
-1749,11
+1748,6
@@
static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
struct net_device *ndev = pci_get_drvdata(pdev);
vlsi_irda_dev_t *idev;
struct net_device *ndev = pci_get_drvdata(pdev);
vlsi_irda_dev_t *idev;
- if (state < 1 || state > 3 ) {
- IRDA_ERROR("%s - %s: invalid pm state request: %u\n",
- __FUNCTION__, PCIDEV_NAME(pdev), state);
- return 0;
- }
if (!ndev) {
IRDA_ERROR("%s - %s: no netdevice \n",
__FUNCTION__, PCIDEV_NAME(pdev));
if (!ndev) {
IRDA_ERROR("%s - %s: no netdevice \n",
__FUNCTION__, PCIDEV_NAME(pdev));
@@
-1762,12
+1756,12
@@
static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
idev = ndev->priv;
down(&idev->sem);
if (pdev->current_state != 0) { /* already suspended */
idev = ndev->priv;
down(&idev->sem);
if (pdev->current_state != 0) { /* already suspended */
- if (state
> pdev->current_state) {
/* simply go deeper */
- pci_set_power_state(pdev,
state
);
- pdev->current_state = state;
+ if (state
.event > pdev->current_state) {
/* simply go deeper */
+ pci_set_power_state(pdev,
pci_choose_state(pdev, state)
);
+ pdev->current_state = state
.event
;
}
else
}
else
- IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state);
+ IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state
.event
);
up(&idev->sem);
return 0;
}
up(&idev->sem);
return 0;
}
@@
-1781,8
+1775,8
@@
static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
idev->new_baud = idev->baud;
}
idev->new_baud = idev->baud;
}
- pci_set_power_state(pdev,
state
);
- pdev->current_state = state;
+ pci_set_power_state(pdev,
pci_choose_state(pdev, state)
);
+ pdev->current_state = state
.event
;
idev->resume_ok = 1;
up(&idev->sem);
return 0;
idev->resume_ok = 1;
up(&idev->sem);
return 0;
@@
-1807,8
+1801,8
@@
static int vlsi_irda_resume(struct pci_dev *pdev)
return 0;
}
return 0;
}
- pci_set_power_state(pdev, 0);
- pdev->current_state =
0
;
+ pci_set_power_state(pdev,
PCI_D
0);
+ pdev->current_state =
PM_EVENT_ON
;
if (!idev->resume_ok) {
/* should be obsolete now - but used to happen due to:
if (!idev->resume_ok) {
/* should be obsolete now - but used to happen due to:
@@
-1880,11
+1874,11
@@
static int __init vlsi_mod_init(void)
sirpulse = !!sirpulse;
sirpulse = !!sirpulse;
- /*
create_proc_entry
returns NULL if !CONFIG_PROC_FS.
+ /*
proc_mkdir
returns NULL if !CONFIG_PROC_FS.
* Failure to create the procfs entry is handled like running
* without procfs - it's not required for the driver to work.
*/
* Failure to create the procfs entry is handled like running
* without procfs - it's not required for the driver to work.
*/
- vlsi_proc_root =
create_proc_entry(PROC_DIR, S_IF
DIR, NULL);
+ vlsi_proc_root =
proc_mkdir(PROC_
DIR, NULL);
if (vlsi_proc_root) {
/* protect registered procdir against module removal.
* Because we are in the module init path there's no race
if (vlsi_proc_root) {
/* protect registered procdir against module removal.
* Because we are in the module init path there's no race
@@
-1893,7
+1887,7
@@
static int __init vlsi_mod_init(void)
vlsi_proc_root->owner = THIS_MODULE;
}
vlsi_proc_root->owner = THIS_MODULE;
}
- ret = pci_
module_init
(&vlsi_irda_driver);
+ ret = pci_
register_driver
(&vlsi_irda_driver);
if (ret && vlsi_proc_root)
remove_proc_entry(PROC_DIR, NULL);
if (ret && vlsi_proc_root)
remove_proc_entry(PROC_DIR, NULL);