The patch titled serial_cs: oxsemi quirk breaks resume has been added to the -mm tree. Its filename is serial_cs-oxsemi-quirk-breaks-resume.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: serial_cs: oxsemi quirk breaks resume From: Pavel Machek <pavel@xxxxxx> Quirk is applied on all cards with given manfid (is it that correct?). Unfortunately, that quirk breaks resume on zaurus with billionton bluetooth card inserted: c950ctrl is 0 and outb() faults. I believe it is simply not a multiport card. (info->multi == 1). ... ... confirmed by printks. Signed-off-by: Pavel Machek <pavel@xxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/serial_cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN drivers/serial/serial_cs.c~serial_cs-oxsemi-quirk-breaks-resume drivers/serial/serial_cs.c --- a/drivers/serial/serial_cs.c~serial_cs-oxsemi-quirk-breaks-resume +++ a/drivers/serial/serial_cs.c @@ -146,7 +146,8 @@ static void quirk_wakeup_oxsemi(struct p { struct serial_info *info = link->priv; - outb(12, info->c950ctrl + 1); + if (info->c950ctrl) + outb(12, info->c950ctrl + 1); } /* request_region? oxsemi branch does no request_region too... */ _ Patches currently in -mm which might be from pavel@xxxxxx are drivers-video-msm-update-to-new-kernel.patch linux-next.patch serial_cs-oxsemi-quirk-breaks-resume.patch scripts-get_maintainerpl-add-roles-and-rolestats.patch scripts-get_maintainerpl-fix-non-with-git-blame-and-cleanups.patch msm_sdccc-add-missing-include-fix-compilation.patch msm_sdccc-add-missing-include-fix-compilation-checkpatch-fixes.patch lis3lv02d-axis-remap-and-resource-setup-release.patch lis3lv02d-i2c-support.patch fatfs-use-common-time_to_tm-in-fat_time_unix2fat.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html