4 files changed, 20 insertions, 20 deletions

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 85081172403f..3ecbd67f88c9 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -1034,7 +1034,11 @@ static int __devinit snd_pmac_detect(struct snd_pmac *chip)
         if (of_device_is_compatible(sound, "tumbler")) {
                 chip->model = PMAC_TUMBLER;
                 chip->can_capture = of_machine_is_compatible("PowerMac4,2")
-                                || of_machine_is_compatible("PowerBook4,1");
+                                || of_machine_is_compatible("PowerBook3,2")
+                                || of_machine_is_compatible("PowerBook3,3")
+                                || of_machine_is_compatible("PowerBook4,1")
+                                || of_machine_is_compatible("PowerBook4,2")
+                                || of_machine_is_compatible("PowerBook4,3");
                 chip->can_duplex = 0;
                 // chip->can_byte_swap = 0; /* FIXME: check this */
                 chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
@@ -1228,10 +1232,8 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                                chip->rsrc[i].start + 1,
                                                rnames[i]) == NULL) {
                                 printk(KERN_ERR "snd: can't request rsrc "
-                                       " %d (%s: 0x%016llx:%016llx)\n",
-                                       i, rnames[i],
-                                       (unsigned long long)chip->rsrc[i].start,
-                                       (unsigned long long)chip->rsrc[i].end);
+                                       " %d (%s: %pR)\n",
+                                       i, rnames[i], &chip->rsrc[i]);
                                 err = -ENODEV;
                                 goto __error;
                         }
@@ -1256,10 +1258,8 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                                chip->rsrc[i].start + 1,
                                                rnames[i]) == NULL) {
                                 printk(KERN_ERR "snd: can't request rsrc "
-                                       " %d (%s: 0x%016llx:%016llx)\n",
-                                       i, rnames[i],
-                                       (unsigned long long)chip->rsrc[i].start,
-                                       (unsigned long long)chip->rsrc[i].end);
+                                       " %d (%s: %pR)\n",
+                                       i, rnames[i], &chip->rsrc[i]);
                                 err = -ENODEV;
                                 goto __error;
                         }
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c
index 581a670e8261..bc823a547550 100644
--- a/sound/ppc/snd_ps3.c
+++ b/sound/ppc/snd_ps3.c
@@ -51,7 +51,7 @@ static struct snd_ps3_card_info the_card;
 static int snd_ps3_start_delay = CONFIG_SND_PS3_DEFAULT_START_DELAY;
 
 module_param_named(start_delay, snd_ps3_start_delay, uint, 0644);
-MODULE_PARM_DESC(start_delay, "time to insert silent data in milisec");
+MODULE_PARM_DESC(start_delay, "time to insert silent data in ms");
 
 static int index = SNDRV_DEFAULT_IDX1;
 static char *id = SNDRV_DEFAULT_STR1;
@@ -358,7 +358,7 @@ static irqreturn_t snd_ps3_interrupt(int irq, void *dev_id)
                  * filling dummy data, serial automatically start to
                  * consume them and then will generate normal buffer
                  * empty interrupts.
-                 * If both buffer underflow and buffer empty are occured,
+                 * If both buffer underflow and buffer empty are occurred,
                  * it is better to do nomal data transfer than empty one
                  */
                 snd_ps3_program_dma(card,
diff --git a/sound/ppc/snd_ps3_reg.h b/sound/ppc/snd_ps3_reg.h
index 03fdee4aaaf2..2e6302079566 100644
--- a/sound/ppc/snd_ps3_reg.h
+++ b/sound/ppc/snd_ps3_reg.h
@@ -125,7 +125,7 @@
    transfers.  Any interrupts associated with the canceled transfers
    will occur as if the transfer had finished.
    Since this bit is designed to recover from DMA related issues
-   which are caused by unpredictable situations, it is prefered to wait
+   which are caused by unpredictable situations, it is preferred to wait
    for normal DMA transfer end without using this bit.
 */
 #define PS3_AUDIO_CONFIG_CLEAR          (1 << 8)  /* RWIVF */
@@ -316,13 +316,13 @@ DISABLED=Interrupt generation disabled.
 
 /*
 Audio Port Interrupt Status Register
-Indicates Interrupt status, which interrupt has occured, and can clear
+Indicates Interrupt status, which interrupt has occurred, and can clear
 each interrupt in this register.
 Writing 1b to a field containing 1b clears field and de-asserts interrupt.
 Writing 0b to a field has no effect.
 Field vaules are the following:
-0 - Interrupt hasn't occured.
-1 - Interrupt has occured.
+0 - Interrupt hasn't occurred.
+1 - Interrupt has occurred.
 
 
  31            24 23           16 15            8 7             0
@@ -473,7 +473,7 @@ Channel N is out of action by setting 0 to asoen.
 /*
 Sampling Rate
 Specifies the divide ratio of the bit clock (clock output
-from bclko) used by the 3-wire Audio Output Clock, whcih
+from bclko) used by the 3-wire Audio Output Clock, which
 is applied to the master clock selected by mcksel.
 Data output is synchronized with this clock.
 */
@@ -756,7 +756,7 @@ The STATUS field can be used to monitor the progress of a DMA request.
 DONE indicates the previous request has completed.
 EVENT indicates that the DMA engine is waiting for the EVENT to occur.
 PENDING indicates that the DMA engine has not started processing this
-request, but the EVENT has occured.
+request, but the EVENT has occurred.
 DMA indicates that the data transfer is in progress.
 NOTIFY indicates that the notifier signalling end of transfer is being written.
 CLEAR indicated that the previous transfer was cleared.
@@ -824,7 +824,7 @@ AUDIOFIFO = Audio WriteData FIFO,
 
 /*
 PS3_AUDIO_DMASIZE specifies the number of 128-byte blocks + 1 to transfer.
-So a value of 0 means 128-bytes will get transfered.
+So a value of 0 means 128-bytes will get transferred.
 
 
  31            24 23           16 15            8 7             0
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 20afdf9772ee..9cea84c3e0c6 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -785,7 +785,7 @@ static int snapper_set_capture_source(struct pmac_tumbler *mix)
         if (! mix->i2c.client)
                 return -ENODEV;
         if (mix->capture_source)
-                mix->acs = mix->acs |= 2;
+                mix->acs |= 2;
         else
                 mix->acs &= ~2;
         return i2c_smbus_write_byte_data(mix->i2c.client, TAS_REG_ACS, mix->acs);
@@ -1000,7 +1000,7 @@ static void device_change_handler(struct work_struct *work)
                                    chip->lineout_sw_ctl);
                 if (mix->anded_reset)
                         msleep(10);
-                check_mute(chip, &mix->amp_mute, 1, mix->auto_mute_notify,
+                check_mute(chip, &mix->amp_mute, !IS_G4DA, mix->auto_mute_notify,
                            chip->speaker_sw_ctl);
         } else {
                 /* unmute speaker, mute others */