From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alan Stern <stern@rowland.harvard.edu>
Subject: linux-next: manual merge of the ttydev tree with Linus' tree
Date: Tue, 14 Jul 2009 13:46:44 +1000 [thread overview]
Message-ID: <20090714134644.644cb3fc.sfr@canb.auug.org.au> (raw)
Hi Alan,
Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/sierra.c between commit
7bae0a070db4bc2761dd9515f450cdfa3f3f248c ("USB: Sierra: fix oops upon
device close") from Linus' tree and commit
2db76e5f8b74d5eb0d26a55d4b4e0b2b1c76ff4d ("tty-usb-sierra-updates-pm")
from the ttydev tree.
Just context changes. I fixed ti up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/usb/serial/sierra.c
index f48d05e,9b22dff..0000000
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@@ -841,7 -884,11 +884,10 @@@ static void sierra_release(struct usb_s
portdata = usb_get_serial_port_data(port);
if (!portdata)
continue;
+ portdata->suspend_status = 0;
+ device_remove_file(&port->dev, &dev_attr_suspend_status);
+
kfree(portdata);
- usb_set_serial_port_data(port, NULL);
}
}
@@@ -864,8 -979,11 +978,11 @@@ static struct usb_serial_driver sierra_
.tiocmget = sierra_tiocmget,
.tiocmset = sierra_tiocmset,
.attach = sierra_startup,
- .disconnect = sierra_disconnect,
+ .release = sierra_release,
+ .port_probe = sierra_create_sysfs_attrs,
.read_int_callback = sierra_instat_callback,
+ .suspend = sierra_suspend,
+ .resume = sierra_resume,
};
/* Functions used by new usb-serial code. */
reply other threads:[~2009-07-14 3:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090714134644.644cb3fc.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox