diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-02-21 02:32:19 -0500 |
| commit | 3f60db4bde17088feed5f143582d7661cdbb9a01 (patch) | |
| tree | 21a7866ae6d199cfa8f619ced9500687bdf84f18 /drivers/misc/cb710/core.c | |
| parent | 5e36097889725dbe4f098c3f1e93cb2f21cae6ee (diff) | |
| parent | b01543dfe67bb1d191998e90d20534dc354de059 (diff) | |
Merge commit 'v3.3-rc4'
Diffstat (limited to 'drivers/misc/cb710/core.c')
| -rw-r--r-- | drivers/misc/cb710/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c index 68cd05b6d829..85cc7710193c 100644 --- a/drivers/misc/cb710/core.c +++ b/drivers/misc/cb710/core.c | |||
| @@ -245,6 +245,7 @@ static int __devinit cb710_probe(struct pci_dev *pdev, | |||
| 245 | if (err) | 245 | if (err) |
| 246 | return err; | 246 | return err; |
| 247 | 247 | ||
| 248 | spin_lock_init(&chip->irq_lock); | ||
| 248 | chip->pdev = pdev; | 249 | chip->pdev = pdev; |
| 249 | chip->iobase = pcim_iomap_table(pdev)[0]; | 250 | chip->iobase = pcim_iomap_table(pdev)[0]; |
| 250 | 251 | ||