diff options
| author | Malcolm Priestley | 2014-10-29 18:44:04 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-10-29 21:31:31 +0100 |
| commit | 10d6f1b743961b191ff6347d3a5b5f8801a638fe (patch) | |
| tree | 454fa75fa27e5f055b5ca3074a7ae3b3a337580e /drivers/staging/vt6655/device_main.c | |
| parent | staging: vt6655: s_vGenerateTxParameter remove unused cbMACHdLen (diff) | |
| download | kernel-qcow2-linux-10d6f1b743961b191ff6347d3a5b5f8801a638fe.tar.gz kernel-qcow2-linux-10d6f1b743961b191ff6347d3a5b5f8801a638fe.tar.xz kernel-qcow2-linux-10d6f1b743961b191ff6347d3a5b5f8801a638fe.zip | |
staging: vt6655: device_init_registers replace spin lock
Use spin_lock_irqsave and spin_unlock_irqrestore.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index d7dd002f8daf..c5eca1075d3a 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -406,6 +406,7 @@ device_set_options(struct vnt_private *pDevice) static void device_init_registers(struct vnt_private *pDevice) { + unsigned long flags; unsigned int ii; unsigned char byValue; unsigned char byValue1; @@ -439,11 +440,11 @@ static void device_init_registers(struct vnt_private *pDevice) /* Get Local ID */ VNSvInPortB(pDevice->PortOffset + MAC_REG_LOCALID, &pDevice->byLocalID); - spin_lock_irq(&pDevice->lock); + spin_lock_irqsave(&pDevice->lock, flags); SROMvReadAllContents(pDevice->PortOffset, pDevice->abyEEPROM); - spin_unlock_irq(&pDevice->lock); + spin_unlock_irqrestore(&pDevice->lock, flags); /* Get Channel range */ pDevice->byMinChannel = 1; |