From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754606Ab1FIG6K (ORCPT ); Thu, 9 Jun 2011 02:58:10 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:48689 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752633Ab1FIG6I (ORCPT ); Thu, 9 Jun 2011 02:58:08 -0400 Date: Thu, 9 Jun 2011 16:58:04 +1000 From: Stephen Rothwell To: Greg KH Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Arjan Mels , matt mooney Subject: linux-next: manual merge of the staging tree with the staging.current tree Message-Id: <20110609165804.2e96bb77.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, Today's linux-next merge of the staging tree got a conflict in drivers/staging/usbip/stub_dev.c between commit d3ac07788017 ("staging: usbip: bugfix prevent driver unbind") from the staging.current tree and commit d012c2a5aca1 ("staging: usbip: stub_dev.c: move stub_driver definition and update driver name") from the staging tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/staging/usbip/stub_dev.c index 8cbea42,e26b2ee..0000000 --- a/drivers/staging/usbip/stub_dev.c +++ b/drivers/staging/usbip/stub_dev.c @@@ -546,19 -524,9 +524,28 @@@ static void stub_disconnect(struct usb_ } } +/* + * Presence of pre_reset and post_reset prevents the driver from being unbound + * when the device is being reset + */ + +int stub_pre_reset(struct usb_interface *interface) +{ + dev_dbg(&interface->dev, "pre_reset\n"); + return 0; +} + +int stub_post_reset(struct usb_interface *interface) +{ + dev_dbg(&interface->dev, "post_reset\n"); + return 0; +} ++ + struct usb_driver stub_driver = { + .name = "usbip-host", + .probe = stub_probe, + .disconnect = stub_disconnect, + .id_table = stub_table, ++ .pre_reset = stub_pre_reset, ++ .post_reset = stub_post_reset, + };