Commit a819a228 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Greg Kroah-Hartman

misc: tifm: match return type of wait_for_completion_timeout

return type of wait_for_completion_timeout is unsigned long not int. The
rc variable is in use for other calls so an additional timeout variable
of type unsigned long is added.
Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03190c67
...@@ -236,6 +236,7 @@ static int tifm_7xx1_resume(struct pci_dev *dev) ...@@ -236,6 +236,7 @@ static int tifm_7xx1_resume(struct pci_dev *dev)
{ {
struct tifm_adapter *fm = pci_get_drvdata(dev); struct tifm_adapter *fm = pci_get_drvdata(dev);
int rc; int rc;
unsigned long timeout;
unsigned int good_sockets = 0, bad_sockets = 0; unsigned int good_sockets = 0, bad_sockets = 0;
unsigned long flags; unsigned long flags;
unsigned char new_ids[fm->num_sockets]; unsigned char new_ids[fm->num_sockets];
...@@ -272,8 +273,8 @@ static int tifm_7xx1_resume(struct pci_dev *dev) ...@@ -272,8 +273,8 @@ static int tifm_7xx1_resume(struct pci_dev *dev)
if (good_sockets) { if (good_sockets) {
fm->finish_me = &finish_resume; fm->finish_me = &finish_resume;
spin_unlock_irqrestore(&fm->lock, flags); spin_unlock_irqrestore(&fm->lock, flags);
rc = wait_for_completion_timeout(&finish_resume, HZ); timeout = wait_for_completion_timeout(&finish_resume, HZ);
dev_dbg(&dev->dev, "wait returned %d\n", rc); dev_dbg(&dev->dev, "wait returned %lu\n", timeout);
writel(TIFM_IRQ_FIFOMASK(good_sockets) writel(TIFM_IRQ_FIFOMASK(good_sockets)
| TIFM_IRQ_CARDMASK(good_sockets), | TIFM_IRQ_CARDMASK(good_sockets),
fm->addr + FM_CLEAR_INTERRUPT_ENABLE); fm->addr + FM_CLEAR_INTERRUPT_ENABLE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment