Skip to content

Merge Linux 3.0.58 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hardkernel merged 51 commits into from
Jan 14, 2013
Merged

Merge Linux 3.0.58 #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
868d550
Fix build error if enable xfs or btfs
hardkernel Jan 10, 2013
a8695e1
bonding: Bonding driver does not consider the gso_max_size/gso_max_se…
Nov 21, 2012
cefbc05
bonding: fix race condition in bonding_store_slaves_active
Nov 29, 2012
e620776
sctp: fix memory leak in sctp_datamsg_from_user() when copy from user…
rantala Nov 27, 2012
55fdb80
sctp: fix -ENOMEM result with invalid user space pointer in sendto() …
rantala Nov 22, 2012
80fef29
ne2000: add the right platform device
Nov 20, 2012
98ffdcd
irda: sir_dev: Fix copy/paste typo
shcgit Nov 20, 2012
8d759d1
usb/ipheth: Add iPhone 5 support
Oct 14, 2012
947d716
pnpacpi: fix incorrect TEST_ALPHA() test
Alan-Cox Dec 7, 2012
28278b3
exec: do not leave bprm->interp on stack
kees Dec 20, 2012
276c234
x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
Dec 11, 2012
812e638
virtio: force vring descriptors to be allocated from lowmem
wildea01 Oct 19, 2012
8fafe01
mm: Fix PageHead when !CONFIG_PAGEFLAGS_EXTENDED
chazy Dec 21, 2012
51afc62
tmpfs mempolicy: fix /proc/mounts corrupting memory
Jan 2, 2013
5a6400c
ALSA: usb-audio: Avoid autopm calls after disconnection
tiwai Dec 3, 2012
6ab1dea
ALSA: usb-audio: Fix missing autopm for MIDI input
tiwai Dec 3, 2012
45a62af
p54usb: add USB ID for T-Com Sinus 154 data II
Dec 22, 2012
1db444f
p54usb: add USBIDs for two more p54usb devices
chunkeey Dec 27, 2012
42fac8e
usb: gadget: phonet: free requests in pn_bind()'s error path
Oct 22, 2012
611d6f0
ACPI / scan: Do not use dummy HID for system bus ACPI nodes
rafaeljw Jan 4, 2013
64b45c8
NFS: avoid NULL dereference in nfs_destroy_server
neilbrown Dec 13, 2012
9d53441
NFS: Fix calls to drop_nlink()
Dec 14, 2012
d6e0c42
nfsd4: fix oops on unusual readlike compound
Dec 4, 2012
31c4e8c
nfs: fix null checking in nfs_get_option_str()
xiw Jan 4, 2013
ada84ad
Input: walkera0701 - fix crash on startup
Dec 15, 2012
d038911
genirq: Always force thread affinity
KAGA-KOKO Nov 3, 2012
5729b13
xhci: Add Lynx Point LP to list of Intel switchable hosts
Nov 9, 2012
01fdcf4
cgroup: remove incorrect dget/dput() pair in cgroup_create_dir()
htejun Nov 19, 2012
6c94f43
x86, amd: Disable way access filter on Piledriver CPUs
aprzywar Oct 31, 2012
6fe7238
ftrace: Do not function trace inlined functions
Dec 12, 2011
1e8928a
sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
kleikamp Dec 17, 2012
9b79271
net: sched: integer overflow fix
matiniero Dec 21, 2012
86791bb
tcp: implement RFC 5961 3.2
edumazet Jul 17, 2012
ab5c718
tcp: implement RFC 5961 4.2
edumazet Jul 17, 2012
282190e
tcp: refine SYN handling in tcp_validate_incoming
edumazet Jul 17, 2012
ffd34fc
tcp: tcp_replace_ts_recent() should not be called from tcp_validate_i…
edumazet Nov 13, 2012
8d15569
tcp: RFC 5961 5.2 Blind Data Injection Attack Mitigation
edumazet Oct 21, 2012
f61019b
ARM: mm: use pteval_t to represent page protection values
wildea01 Sep 18, 2012
0b6916a
ARM: missing ->mmap_sem around find_vma() in swp_emulate.c
Dec 16, 2012
decbd08
solos-pci: fix double-free of TX skb in DMA mode
dwmw2 Dec 11, 2012
e641306
PCI: Reduce Ricoh 0xe822 SD card reader base clock frequency to 50MHz
amluto Dec 1, 2012
1bc2621
Bluetooth: ath3k: Add support for VAIO VPCEH [0489:e027]
mrkindustries Nov 6, 2012
9b7b38a
Bluetooth: cancel power_on work when unregistering the device
Nov 21, 2012
4a16c40
CRIS: fix I/O macros
cminyard Dec 18, 2012
afc0e69
drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
tonyprisk Jan 4, 2013
a2e1113
drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time
tonyprisk Jan 4, 2013
c39096f
mm: limit mmu_gather batching to fix soft lockups on !CONFIG_PREEMPT
Jan 4, 2013
a0ed2e7
can: Do not call dev_put if restart timer is running upon close
Nov 27, 2012
2a68fec
Linux 3.0.58
gregkh Jan 11, 2013
08c96fe
Merge branch 'odroid-3.0.y' of git://github.com/hardkernel/linux into…
zehome Jan 12, 2013
c59e25f
Merge branch 'linux-3.0.58' into odroid-ed-3.0.y
zehome Jan 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PCI: Reduce Ricoh 0xe822 SD card reader base clock frequency to 50MHz 
commit 812089e upstream.

Otherwise it fails like this on cards like the Transcend 16GB SDHC card:

    mmc0: new SDHC card at address b368
    mmcblk0: mmc0:b368 SDC   15.0 GiB
    mmcblk0: error -110 sending status command, retrying
    mmcblk0: error -84 transferring data, sector 0, nr 8, cmd response 0x900, card status 0xb0

Tested on my Lenovo x200 laptop.

[bhelgaas: changelog]
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Chris Ball <cjb@laptop.org>
CC: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@amluto @gregkh
amluto authored and gregkh committed Jan 11, 2013
commit e64130678871755b43019a3ee191d6548d9862ca
7 changes: 5 additions & 2 deletions drivers/pci/quirks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2746,7 +2746,7 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
if (PCI_FUNC(dev->devfn))
return;
/*
* RICOH 0xe823 SD/MMC card reader fails to recognize
* RICOH 0xe822 and 0xe823 SD/MMC card readers fail to recognize
* certain types of SD/MMC cards. Lowering the SD base
* clock frequency from 200Mhz to 50Mhz fixes this issue.
*
Expand All @@ -2757,7 +2757,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
* 0xf9 - Key register for 0x150
* 0xfc - key register for 0xe1
*/
if (dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
if (dev->device == PCI_DEVICE_ID_RICOH_R5CE822 ||
dev->device == PCI_DEVICE_ID_RICOH_R5CE823) {
pci_write_config_byte(dev, 0xf9, 0xfc);
pci_write_config_byte(dev, 0x150, 0x10);
pci_write_config_byte(dev, 0xf9, 0x00);
Expand All @@ -2784,6 +2785,8 @@ static void ricoh_mmc_fixup_r5c832(struct pci_dev *dev)
}
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5C832, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE822, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_RICOH, PCI_DEVICE_ID_RICOH_R5CE823, ricoh_mmc_fixup_r5c832);
#endif /*CONFIG_MMC_RICOH_MMC*/
Expand Down
1 change: 1 addition & 0 deletions include/linux/pci_ids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,6 +1537,7 @@
#define PCI_DEVICE_ID_RICOH_RL5C476 0x0476
#define PCI_DEVICE_ID_RICOH_RL5C478 0x0478
#define PCI_DEVICE_ID_RICOH_R5C822 0x0822
#define PCI_DEVICE_ID_RICOH_R5CE822 0xe822
#define PCI_DEVICE_ID_RICOH_R5CE823 0xe823
#define PCI_DEVICE_ID_RICOH_R5C832 0x0832
#define PCI_DEVICE_ID_RICOH_R5C843 0x0843
Expand Down