+++ /dev/null
-From 29ebe40284c75a5888c601872059fca7e258528d Mon Sep 17 00:00:00 2001
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Thu, 12 Apr 2012 13:55:36 -0400
-Subject: ALSA: hda/realtek - Add quirk for Mac Pro 5,1 machines
-
-From: Josh Boyer <jwboyer@redhat.com>
-
-commit 29ebe40284c75a5888c601872059fca7e258528d upstream.
-
-A user reported that setting model=imac24 used to allow sound to work on their
-Mac Pro 5,1 machine. Commit 5671087ffa "Move ALC885 macpro and imac24 models
-to auto-parser" removed this model option. All Mac machines are now explicitly
-handled with a quirk and the auto-parser. This adds a quirk for the device
-found on the Mac Pro 5,1 machines.
-
-This (partially) fixes https://bugzilla.redhat.com/show_bug.cgi?id=808559
-
-[sorted the new entry in the ID number order by tiwai]
-
-Reported-by: Gabriel Somlo <somlo@cmu.edu>
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index d25a6f9..8f4a484 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -5389,6 +5389,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
- SND_PCI_QUIRK(0x106b, 0x3f00, "Macbook 5,1", ALC889_FIXUP_IMAC91_VREF),
- SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC889_FIXUP_IMAC91_VREF),
- SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC889_FIXUP_IMAC91_VREF),
-+ SND_PCI_QUIRK(0x106b, 0x4200, "Mac Pro 5,1", ALC885_FIXUP_MACPRO_GPIO),
- SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC889_FIXUP_IMAC91_VREF),
- SND_PCI_QUIRK(0x106b, 0x4900, "iMac 9,1 Aluminum", ALC889_FIXUP_IMAC91_VREF),
- SND_PCI_QUIRK(0x106b, 0x4a00, "Macbook 5,2", ALC889_FIXUP_IMAC91_VREF),
--- /dev/null
+From jrnieder@gmail.com Sun Apr 29 18:03:07 2012
+From: Arend van Spriel <arend@broadcom.com>
+Date: Wed, 25 Apr 2012 17:39:59 -0500
+Subject: brcm80211: smac: resume transmit fifo upon receiving frames
+To: Arend van Spriel <arend@broadcom.com>
+Message-ID: <20120425223959.GA6243@burratino>
+
+From: Arend van Spriel <arend@broadcom.com>
+
+commit badc4f07622f0f7093a201638f45e85765f1b5e4 upstream.
+
+There have been reports about not being able to use access-points
+on channel 12 and 13 or having connectivity issues when these channels
+were part of the selected regulatory domain. Upon switching to these
+channels the brcmsmac driver suspends the transmit dma fifos. This
+patch resumes them upon handing over the first received beacon to
+mac80211.
+
+This patch is to be applied to the stable tree for kernel versions
+3.2 and 3.3.
+
+Tested-by: Francesco Saverio Schiavarelli <fschiava@libero.it>
+Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
+Reviewed-by: Brett Rudley <brudley@broadcom.com>
+Signed-off-by: Arend van Spriel <arend@broadcom.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 3 +--
+ drivers/staging/brcm80211/brcmsmac/wlc_bmac.h | 1 +
+ drivers/staging/brcm80211/brcmsmac/wlc_main.c | 8 ++++++++
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
+--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
++++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+@@ -143,7 +143,6 @@ static bool wlc_bmac_validate_chip_acces
+ static char *wlc_get_macaddr(struct wlc_hw_info *wlc_hw);
+ static void wlc_mhfdef(struct wlc_info *wlc, u16 *mhfs, u16 mhf2_init);
+ static void wlc_mctrl_write(struct wlc_hw_info *wlc_hw);
+-static void wlc_bmac_mute(struct wlc_hw_info *wlc_hw, bool want, mbool flags);
+ static void wlc_ucode_mute_override_set(struct wlc_hw_info *wlc_hw);
+ static void wlc_ucode_mute_override_clear(struct wlc_hw_info *wlc_hw);
+ static u32 wlc_wlintrsoff(struct wlc_info *wlc);
+@@ -2725,7 +2724,7 @@ void wlc_intrsrestore(struct wlc_info *w
+ W_REG(&wlc_hw->regs->macintmask, wlc->macintmask);
+ }
+
+-static void wlc_bmac_mute(struct wlc_hw_info *wlc_hw, bool on, mbool flags)
++void wlc_bmac_mute(struct wlc_hw_info *wlc_hw, bool on, mbool flags)
+ {
+ u8 null_ether_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
+
+--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h
++++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h
+@@ -103,6 +103,7 @@ extern void wlc_bmac_macphyclk_set(struc
+ extern void wlc_bmac_phy_reset(struct wlc_hw_info *wlc_hw);
+ extern void wlc_bmac_corereset(struct wlc_hw_info *wlc_hw, u32 flags);
+ extern void wlc_bmac_reset(struct wlc_hw_info *wlc_hw);
++extern void wlc_bmac_mute(struct wlc_hw_info *wlc_hw, bool want, mbool flags);
+ extern void wlc_bmac_init(struct wlc_hw_info *wlc_hw, chanspec_t chanspec,
+ bool mute);
+ extern int wlc_bmac_up_prep(struct wlc_hw_info *wlc_hw);
+--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
++++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+@@ -6145,6 +6145,7 @@ wlc_recvctl(struct wlc_info *wlc, d11rxh
+ {
+ int len_mpdu;
+ struct ieee80211_rx_status rx_status;
++ struct ieee80211_hdr *hdr;
+
+ memset(&rx_status, 0, sizeof(rx_status));
+ prep_mac80211_status(wlc, rxh, p, &rx_status);
+@@ -6154,6 +6155,13 @@ wlc_recvctl(struct wlc_info *wlc, d11rxh
+ skb_pull(p, D11_PHY_HDR_LEN);
+ __skb_trim(p, len_mpdu);
+
++ /* unmute transmit */
++ if (wlc->hw->suspended_fifos) {
++ hdr = (struct ieee80211_hdr *)p->data;
++ if (ieee80211_is_beacon(hdr->frame_control))
++ wlc_bmac_mute(wlc->hw, false, 0);
++ }
++
+ memcpy(IEEE80211_SKB_RXCB(p), &rx_status, sizeof(rx_status));
+ ieee80211_rx_irqsafe(wlc->pub->ieee_hw, p);
+ return;
--- /dev/null
+From jrnieder@gmail.com Sun Apr 29 18:02:17 2012
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Wed, 25 Apr 2012 01:17:42 -0500
+Subject: EHCI: fix criterion for resuming the root hub
+To: Greg KH <gregkh@linuxfoundation.org>
+Message-ID: <20120425061741.GA14971@burratino>
+
+From: Alan Stern <stern@rowland.harvard.edu>
+
+commit dc75ce9d929aabeb0843a6b1a4ab320e58ba1597 upstream.
+
+This patch (as1542) changes the criterion ehci-hcd uses to tell when
+it needs to resume the controller's root hub. A resume is needed when
+a port status change is detected, obviously, but only if the root hub
+is currently suspended.
+
+Right now the driver tests whether the root hub is running, and that
+is not the correct test. In particular, if the controller has died
+then the root hub should not be restarted. In addition, some buggy
+hardware occasionally requires the root hub to be running and
+sending out SOF packets even while it is nominally supposed to be
+suspended.
+
+In the end, the test needs to be changed. Rather than checking whether
+the root hub is currently running, the driver will now check whether
+the root hub is currently suspended. This will yield the correct
+behavior in all cases.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+CC: Peter Chen <B29397@freescale.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+---
+ drivers/usb/host/ehci-hcd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -865,7 +865,7 @@ static irqreturn_t ehci_irq (struct usb_
+ pcd_status = status;
+
+ /* resume root hub? */
+- if (!(cmd & CMD_RUN))
++ if (hcd->state == HC_STATE_SUSPENDED)
+ usb_hcd_resume_root_hub(hcd);
+
+ /* get per-port change detect bits */
--- /dev/null
+From jrnieder@gmail.com Sun Apr 29 18:04:18 2012
+From: David Miller <davem@davemloft.net>
+Date: Wed, 25 Apr 2012 19:41:32 -0500
+Subject: Fix modpost failures in fedora 17
+To: Greg KH <gregkh@linuxfoundation.org>
+Message-ID: <20120426004131.GA8556@burratino>
+Content-Disposition: inline
+
+From: David Miller <davem@davemloft.net>
+
+commit e88aa7bbbe3046a125ea1936b16bb921cc9c6349 upstream.
+
+The symbol table on x86-64 starts to have entries that have names
+like:
+
+_GLOBAL__sub_I_65535_0___mod_x86cpu_device_table
+
+They are of type STT_FUNCTION and this one had a length of 18. This
+matched the device ID validation logic and it barfed because the
+length did not meet the device type's criteria.
+
+--------------------
+FATAL: arch/x86/crypto/aesni-intel: sizeof(struct x86cpu_device_id)=16 is not a modulo of the size of section __mod_x86cpu_device_table=18.
+Fix definition of struct x86cpu_device_id in mod_devicetable.h
+--------------------
+
+These are some kind of compiler tool internal stuff being emitted and
+not something we want to inspect in modpost's device ID table
+validation code.
+
+So skip the symbol if it is not of type STT_OBJECT.
+
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Acked-by: Sam Ravnborg <sam@ravnborg.org>
+Signed-off-by: Michal Marek <mmarek@suse.cz>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+Thanks,
+Jonathan
+
+ scripts/mod/file2alias.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/scripts/mod/file2alias.c
++++ b/scripts/mod/file2alias.c
+@@ -905,6 +905,10 @@ void handle_moddevtable(struct module *m
+ if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
+ return;
+
++ /* We're looking for an object */
++ if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
++ return;
++
+ /* Handle all-NULL symbols allocated into .bss */
+ if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
+ zeros = calloc(1, sym->st_size);
--- /dev/null
+From jrnieder@gmail.com Sun Apr 29 18:05:13 2012
+From: Alex Williamson <alex.williamson@redhat.com>
+Date: Fri, 27 Apr 2012 16:54:08 -0500
+Subject: KVM: unmap pages from the iommu when slots are removed
+To: Alex Williamson <alex.williamson@redhat.com>
+Message-ID: <20120427215408.GD2821@burratino>
+
+From: Alex Williamson <alex.williamson@redhat.com>
+
+commit 32f6daad4651a748a58a3ab6da0611862175722f upstream.
+
+We've been adding new mappings, but not destroying old mappings.
+This can lead to a page leak as pages are pinned using
+get_user_pages, but only unpinned with put_page if they still
+exist in the memslots list on vm shutdown. A memslot that is
+destroyed while an iommu domain is enabled for the guest will
+therefore result in an elevated page reference count that is
+never cleared.
+
+Additionally, without this fix, the iommu is only programmed
+with the first translation for a gpa. This can result in
+peer-to-peer errors if a mapping is destroyed and replaced by a
+new mapping at the same gpa as the iommu will still be pointing
+to the original, pinned memory address.
+
+Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
+Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/linux/kvm_host.h | 6 ++++++
+ virt/kvm/iommu.c | 12 ++++++++----
+ virt/kvm/kvm_main.c | 5 +++--
+ 3 files changed, 17 insertions(+), 6 deletions(-)
+
+--- a/include/linux/kvm_host.h
++++ b/include/linux/kvm_host.h
+@@ -554,6 +554,7 @@ void kvm_free_irq_source_id(struct kvm *
+
+ #ifdef CONFIG_IOMMU_API
+ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
++void kvm_iommu_unmap_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
+ int kvm_iommu_map_guest(struct kvm *kvm);
+ int kvm_iommu_unmap_guest(struct kvm *kvm);
+ int kvm_assign_device(struct kvm *kvm,
+@@ -567,6 +568,11 @@ static inline int kvm_iommu_map_pages(st
+ return 0;
+ }
+
++static inline void kvm_iommu_unmap_pages(struct kvm *kvm,
++ struct kvm_memory_slot *slot)
++{
++}
++
+ static inline int kvm_iommu_map_guest(struct kvm *kvm)
+ {
+ return -ENODEV;
+--- a/virt/kvm/iommu.c
++++ b/virt/kvm/iommu.c
+@@ -285,6 +285,11 @@ static void kvm_iommu_put_pages(struct k
+ }
+ }
+
++void kvm_iommu_unmap_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
++{
++ kvm_iommu_put_pages(kvm, slot->base_gfn, slot->npages);
++}
++
+ static int kvm_iommu_unmap_memslots(struct kvm *kvm)
+ {
+ int i, idx;
+@@ -293,10 +298,9 @@ static int kvm_iommu_unmap_memslots(stru
+ idx = srcu_read_lock(&kvm->srcu);
+ slots = kvm_memslots(kvm);
+
+- for (i = 0; i < slots->nmemslots; i++) {
+- kvm_iommu_put_pages(kvm, slots->memslots[i].base_gfn,
+- slots->memslots[i].npages);
+- }
++ for (i = 0; i < slots->nmemslots; i++)
++ kvm_iommu_unmap_pages(kvm, &slots->memslots[i]);
++
+ srcu_read_unlock(&kvm->srcu, idx);
+
+ return 0;
+--- a/virt/kvm/kvm_main.c
++++ b/virt/kvm/kvm_main.c
+@@ -796,12 +796,13 @@ skip_lpage:
+ if (r)
+ goto out_free;
+
+- /* map the pages in iommu page table */
++ /* map/unmap the pages in iommu page table */
+ if (npages) {
+ r = kvm_iommu_map_pages(kvm, &new);
+ if (r)
+ goto out_free;
+- }
++ } else
++ kvm_iommu_unmap_pages(kvm, &old);
+
+ r = -ENOMEM;
+ slots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);
--- /dev/null
+From jrnieder@gmail.com Sun Apr 29 18:06:01 2012
+From: Eric Bénard <eric@eukrea.com>
+Date: Fri, 27 Apr 2012 17:31:18 -0500
+Subject: mmc: unbreak sdhci-esdhc-imx on i.MX25
+To: Eric Bénard <eric@eukrea.com>
+Message-ID: <20120427223118.GE2821@burratino>
+
+From: Eric Bénard <eric@eukrea.com>
+
+commit b89152824f993a9572b47eb31f4579feadeac34c upstream.
+
+This was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
+("mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci") where more
+extensive tests would have shown that read or write of data to the
+card were failing (even if the partition table was correctly read).
+
+Signed-off-by: Eric Bénard <eric@eukrea.com>
+Acked-by: Wolfram Sang <w.sang@pengutronix.de>
+Signed-off-by: Chris Ball <cjb@laptop.org>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+Thanks,
+Jonathan
+
+ drivers/mmc/host/sdhci-esdhc-imx.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/mmc/host/sdhci-esdhc-imx.c
++++ b/drivers/mmc/host/sdhci-esdhc-imx.c
+@@ -245,8 +245,7 @@ static int esdhc_pltfm_init(struct sdhci
+ }
+ pltfm_host->priv = imx_data;
+
+- if (!cpu_is_mx25())
+- host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
++ host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+
+ if (cpu_is_mx25() || cpu_is_mx35()) {
+ /* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */
--- /dev/null
+From jrnieder@gmail.com Sun Apr 29 18:07:05 2012
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Fri, 27 Apr 2012 17:42:43 -0500
+Subject: nfsd: fix b0rken error value for setattr on read-only mount
+To: Al Viro <viro@zeniv.linux.org.uk>
+Message-ID: <20120427224243.GF2821@burratino>
+
+
+From: Al Viro <viro@zeniv.linux.org.uk>
+
+commit 96f6f98501196d46ce52c2697dd758d9300c63f5 upstream.
+
+..._want_write() returns -EROFS on failure, _not_ an NFS error value.
+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/nfsd/nfs4proc.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/fs/nfsd/nfs4proc.c
++++ b/fs/nfsd/nfs4proc.c
+@@ -812,6 +812,7 @@ nfsd4_setattr(struct svc_rqst *rqstp, st
+ struct nfsd4_setattr *setattr)
+ {
+ __be32 status = nfs_ok;
++ int err;
+
+ if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
+ nfs4_lock_state();
+@@ -823,9 +824,9 @@ nfsd4_setattr(struct svc_rqst *rqstp, st
+ return status;
+ }
+ }
+- status = mnt_want_write(cstate->current_fh.fh_export->ex_path.mnt);
+- if (status)
+- return status;
++ err = mnt_want_write(cstate->current_fh.fh_export->ex_path.mnt);
++ if (err)
++ return nfserrno(err);
+ status = nfs_ok;
+
+ status = check_attr_support(rqstp, cstate, setattr->sa_bmval,
--- /dev/null
+From jrnieder@gmail.com Sun Apr 29 18:07:36 2012
+From: Al Viro <viro@zeniv.linux.org.uk>
+Date: Fri, 27 Apr 2012 17:54:38 -0500
+Subject: nfsd: fix error values returned by nfsd4_lockt() when nfsd_open() fails
+To: Al Viro <viro@zeniv.linux.org.uk>
+Message-ID: <20120427225438.GG2821@burratino>
+
+
+From: Al Viro <viro@zeniv.linux.org.uk>
+
+commit 04da6e9d63427b2d0fd04766712200c250b3278f upstream.
+
+nfsd_open() already returns an NFS error value; only vfs_test_lock()
+result needs to be fed through nfserrno(). Broken by commit 55ef12
+(nfsd: Ensure nfsv4 calls the underlying filesystem on LOCKT)
+three years ago...
+
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/nfsd/nfs4state.c | 23 +++++++++--------------
+ 1 file changed, 9 insertions(+), 14 deletions(-)
+
+--- a/fs/nfsd/nfs4state.c
++++ b/fs/nfsd/nfs4state.c
+@@ -3956,16 +3956,14 @@ out:
+ * vfs_test_lock. (Arguably perhaps test_lock should be done with an
+ * inode operation.)
+ */
+-static int nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock)
++static __be32 nfsd_test_lock(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file_lock *lock)
+ {
+ struct file *file;
+- int err;
+-
+- err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);
+- if (err)
+- return err;
+- err = vfs_test_lock(file, lock);
+- nfsd_close(file);
++ __be32 err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file);
++ if (!err) {
++ err = nfserrno(vfs_test_lock(file, lock));
++ nfsd_close(file);
++ }
+ return err;
+ }
+
+@@ -3978,7 +3976,6 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru
+ {
+ struct inode *inode;
+ struct file_lock file_lock;
+- int error;
+ __be32 status;
+
+ if (locks_in_grace())
+@@ -4030,12 +4027,10 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru
+
+ nfs4_transform_lock_offset(&file_lock);
+
+- status = nfs_ok;
+- error = nfsd_test_lock(rqstp, &cstate->current_fh, &file_lock);
+- if (error) {
+- status = nfserrno(error);
++ status = nfsd_test_lock(rqstp, &cstate->current_fh, &file_lock);
++ if (status)
+ goto out;
+- }
++
+ if (file_lock.fl_type != F_UNLCK) {
+ status = nfserr_denied;
+ nfs4_set_lock_denied(&file_lock, &lockt->lt_denied);
--- /dev/null
+From 84c1e86d4ef390ef11c8c4abef9bd5f372163ea5 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sun, 29 Apr 2012 18:09:01 -0700
+Subject: [PATCH] Revert "usb: Fix build error due to dma_mask is not at
+ pdev_archdata at ARM"
+
+This reverts commit d39514c14bd941232976b68e2750dc725b90e724 which is
+e90fc3cb087ce5c5f81e814358222cd6d197b5db upstream as it causes oopses on
+some ppc systems.
+
+Reported-by: Chen Peter-B29397 <B29397@freescale.com>
+Cc: Ramneek Mehresh <ramneek.mehresh@freescale.com>
+Cc: Peter Chen <peter.chen@freescale.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/fsl-mph-dr-of.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/host/fsl-mph-dr-of.c
++++ b/drivers/usb/host/fsl-mph-dr-of.c
+@@ -93,6 +93,7 @@ struct platform_device * __devinit fsl_u
+ pdev->dev.parent = &ofdev->dev;
+
+ pdev->dev.coherent_dma_mask = ofdev->dev.coherent_dma_mask;
++ pdev->dev.dma_mask = &pdev->archdata.dma_mask;
+ *pdev->dev.dma_mask = *ofdev->dev.dma_mask;
+
+ retval = platform_device_add_data(pdev, pdata, sizeof(*pdata));
drm-i915-fix-integer-overflow-in-i915_gem_execbuffer2.patch
drm-i915-fix-integer-overflow-in-i915_gem_do_execbuffer.patch
nl80211-ensure-interface-is-up-in-various-apis.patch
-alsa-hda-realtek-add-quirk-for-mac-pro-5-1-machines.patch
+ehci-fix-criterion-for-resuming-the-root-hub.patch
+brcm80211-smac-resume-transmit-fifo-upon-receiving-frames.patch
+fix-modpost-failures-in-fedora-17.patch
+kvm-unmap-pages-from-the-iommu-when-slots-are-removed.patch
+mmc-unbreak-sdhci-esdhc-imx-on-i.mx25.patch
+nfsd-fix-b0rken-error-value-for-setattr-on-read-only-mount.patch
+nfsd-fix-error-values-returned-by-nfsd4_lockt-when-nfsd_open-fails.patch
+revert-usb-fix-build-error-due-to-dma_mask-is-not-at.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
