Message ID | 1315879284-4667-1-git-send-email-ming.lei@canonical.com |
---|---|
State | New |
Headers | show |
Hi, This patch is for both natty and oneiric. thanks, -- Ming Lei On Tue, Sep 13, 2011 at 10:01 AM, <ming.lei@canonical.com> wrote: > From: Ming Lei <tom.leiming@gmail.com> > > This patch fixes the bug 801719, and the maintainer > (stefan-r-ubz@s5r6.in-berlin.de) of firware subsystem > is submmitting the patch on upstream kernel. > > SRU Justification: > > Impact: > - without the patch, Firewire and SD card are not both > working on Dell E5420/E5420m/E5520/E5520M/E6520/M6600/M4600. > Fix: > - After applying the patch, Firewire and SD card are both > working now. > > BugLink: http://bugs.launchpad.net/bugs/801719 > > Upstream: http://marc.info/?t=131475896500002&r=1&w=2 > > Signed-off-by: Ming Lei <ming.lei@canonical.com> > --- > drivers/firewire/ohci.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c > index ebb8973..2901eb1 100644 > --- a/drivers/firewire/ohci.c > +++ b/drivers/firewire/ohci.c > @@ -302,6 +302,8 @@ static const struct { > > {PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID, > QUIRK_CYCLE_TIMER | QUIRK_NO_MSI}, > + {PCI_VENDOR_ID_O2, PCI_ANY_ID, PCI_ANY_ID, > + QUIRK_NO_MSI}, > }; > > /* This overrides anything that was found in ohci_quirks[]. */ > -- > 1.7.4.1 > >
On 09/12/2011 08:01 PM, ming.lei@canonical.com wrote: > From: Ming Lei<tom.leiming@gmail.com> > > This patch fixes the bug 801719, and the maintainer > (stefan-r-ubz@s5r6.in-berlin.de) of firware subsystem > is submmitting the patch on upstream kernel. > > SRU Justification: > > Impact: > - without the patch, Firewire and SD card are not both > working on Dell E5420/E5420m/E5520/E5520M/E6520/M6600/M4600. > Fix: > - After applying the patch, Firewire and SD card are both > working now. > > BugLink: http://bugs.launchpad.net/bugs/801719 > > Upstream: http://marc.info/?t=131475896500002&r=1&w=2 > > Signed-off-by: Ming Lei<ming.lei@canonical.com> > --- > drivers/firewire/ohci.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c > index ebb8973..2901eb1 100644 > --- a/drivers/firewire/ohci.c > +++ b/drivers/firewire/ohci.c > @@ -302,6 +302,8 @@ static const struct { > > {PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID, > QUIRK_CYCLE_TIMER | QUIRK_NO_MSI}, > + {PCI_VENDOR_ID_O2, PCI_ANY_ID, PCI_ANY_ID, > + QUIRK_NO_MSI}, > }; > > /* This overrides anything that was found in ohci_quirks[]. */ Note that the SRU justification goes in the bug report.
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index ebb8973..2901eb1 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -302,6 +302,8 @@ static const struct { {PCI_VENDOR_ID_VIA, PCI_ANY_ID, PCI_ANY_ID, QUIRK_CYCLE_TIMER | QUIRK_NO_MSI}, + {PCI_VENDOR_ID_O2, PCI_ANY_ID, PCI_ANY_ID, + QUIRK_NO_MSI}, }; /* This overrides anything that was found in ohci_quirks[]. */