diff options
Diffstat (limited to 'drivers/serial/pmac_zilog.c')
-rw-r--r-- | drivers/serial/pmac_zilog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index ab4c85ba3549..0dc786835dca 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
@@ -1645,7 +1645,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state) | |||
1645 | state = pmz_uart_reg.state + uap->port.line; | 1645 | state = pmz_uart_reg.state + uap->port.line; |
1646 | 1646 | ||
1647 | mutex_lock(&pmz_irq_mutex); | 1647 | mutex_lock(&pmz_irq_mutex); |
1648 | mutex_lock(&state->mutex); | 1648 | mutex_lock(&state->port.mutex); |
1649 | 1649 | ||
1650 | spin_lock_irqsave(&uap->port.lock, flags); | 1650 | spin_lock_irqsave(&uap->port.lock, flags); |
1651 | 1651 | ||
@@ -1676,7 +1676,7 @@ static int pmz_suspend(struct macio_dev *mdev, pm_message_t pm_state) | |||
1676 | /* Shut the chip down */ | 1676 | /* Shut the chip down */ |
1677 | pmz_set_scc_power(uap, 0); | 1677 | pmz_set_scc_power(uap, 0); |
1678 | 1678 | ||
1679 | mutex_unlock(&state->mutex); | 1679 | mutex_unlock(&state->port.mutex); |
1680 | mutex_unlock(&pmz_irq_mutex); | 1680 | mutex_unlock(&pmz_irq_mutex); |
1681 | 1681 | ||
1682 | pmz_debug("suspend, switching complete\n"); | 1682 | pmz_debug("suspend, switching complete\n"); |
@@ -1705,7 +1705,7 @@ static int pmz_resume(struct macio_dev *mdev) | |||
1705 | state = pmz_uart_reg.state + uap->port.line; | 1705 | state = pmz_uart_reg.state + uap->port.line; |
1706 | 1706 | ||
1707 | mutex_lock(&pmz_irq_mutex); | 1707 | mutex_lock(&pmz_irq_mutex); |
1708 | mutex_lock(&state->mutex); | 1708 | mutex_lock(&state->port.mutex); |
1709 | 1709 | ||
1710 | spin_lock_irqsave(&uap->port.lock, flags); | 1710 | spin_lock_irqsave(&uap->port.lock, flags); |
1711 | if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) { | 1711 | if (!ZS_IS_OPEN(uap) && !ZS_IS_CONS(uap)) { |
@@ -1737,7 +1737,7 @@ static int pmz_resume(struct macio_dev *mdev) | |||
1737 | } | 1737 | } |
1738 | 1738 | ||
1739 | bail: | 1739 | bail: |
1740 | mutex_unlock(&state->mutex); | 1740 | mutex_unlock(&state->port.mutex); |
1741 | mutex_unlock(&pmz_irq_mutex); | 1741 | mutex_unlock(&pmz_irq_mutex); |
1742 | 1742 | ||
1743 | /* Right now, we deal with delay by blocking here, I'll be | 1743 | /* Right now, we deal with delay by blocking here, I'll be |