[PATCH 2/2] Remove URB_ASYNC_UNLINK from last patch

[PATCH 2/2] Remove URB_ASYNC_UNLINK from last patch

[Karsten Keil]

Sorry, tested the wrong HEAD for compile.

- usb_unlink_urb is always async now, so URB_ASYNC_UNLINK was removed from
  core USB and we must do as well.

Signed-off-by: Karsten Keil <kkeil@suse.de>

---

 drivers/isdn/hisax/st5481_b.c   |    2 --
 drivers/isdn/hisax/st5481_usb.c |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

2eb47d73594e18ef894b94a26bea26962eca1374
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -209,9 +209,7 @@ static void st5481B_mode(struct st5481_b
 	bcs->mode = mode;
 
 	// Cancel all USB transfers on this B channel
-	b_out->urb[0]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(b_out->urb[0]);
-	b_out->urb[1]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(b_out->urb[1]);
 	b_out->busy = 0;
 
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -645,9 +645,7 @@ void st5481_in_mode(struct st5481_in *in
 
 	in->mode = mode;
 
-	in->urb[0]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(in->urb[0]);
-	in->urb[1]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(in->urb[1]);
 
 	if (in->mode != L1_MODE_NULL) {

-- 
Karsten Keil
SuSE Labs
ISDN development

Re: [PATCH 2/2] Remove URB_ASYNC_UNLINK from last patch

[Karsten Keil]

On Mon, Sep 19, 2005 at 04:10:37PM +0200, Karsten Keil wrote:
> 
> Sorry, tested the wrong HEAD for compile.
> 
> - usb_unlink_urb is always async now, so URB_ASYNC_UNLINK was removed from
>   core USB and we must do as well.
> 
> Signed-off-by: Karsten Keil <kkeil@suse.de>
> 

Is here a way in git to "merge" these two patches ?

-- 
Karsten Keil
SuSE Labs
ISDN development

Re: [PATCH 2/2] Remove URB_ASYNC_UNLINK from last patch

[Linus Torvalds]

On Mon, 19 Sep 2005, Karsten Keil wrote:
> 
> Is here a way in git to "merge" these two patches ?

Just do "git diff a..b" to generate the diff over both of them (where "a" 
is the commit before the two, and "b" is the last one, of course).

Btw, the patch doesn't apply any more. I already applied your earlier one.

		Linus

Re: [PATCH 2/2] Remove URB_ASYNC_UNLINK from last patch

[Karsten Keil]

On Mon, Sep 19, 2005 at 10:12:38AM -0700, Linus Torvalds wrote:
> 
> 
> On Mon, 19 Sep 2005, Karsten Keil wrote:
> > 
> > Is here a way in git to "merge" these two patches ?
> 
> Just do "git diff a..b" to generate the diff over both of them (where "a" 
> is the commit before the two, and "b" is the last one, of course).

Thank you.

> 
> Btw, the patch doesn't apply any more. I already applied your earlier one.
> 

You should only need the second part then, which removes the not longer
needed URB_ASYNC_UNLINK settings, this is this one

Subject: [PATCH 2/2] Remove URB_ASYNC_UNLINK from last patch

Sorry, tested the wrong HEAD for compile.

- usb_unlink_urb is always async now, so URB_ASYNC_UNLINK was removed from
  core USB and we must do as well.

Signed-off-by: Karsten Keil <kkeil@suse.de>

---

 drivers/isdn/hisax/st5481_b.c   |    2 --
 drivers/isdn/hisax/st5481_usb.c |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

7c3b2c6e0875808314829f11d8a317af2b1b549c
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c
--- a/drivers/isdn/hisax/st5481_b.c
+++ b/drivers/isdn/hisax/st5481_b.c
@@ -209,9 +209,7 @@ static void st5481B_mode(struct st5481_b
 	bcs->mode = mode;
 
 	// Cancel all USB transfers on this B channel
-	b_out->urb[0]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(b_out->urb[0]);
-	b_out->urb[1]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(b_out->urb[1]);
 	b_out->busy = 0;
 
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c
--- a/drivers/isdn/hisax/st5481_usb.c
+++ b/drivers/isdn/hisax/st5481_usb.c
@@ -645,9 +645,7 @@ void st5481_in_mode(struct st5481_in *in
 
 	in->mode = mode;
 
-	in->urb[0]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(in->urb[0]);
-	in->urb[1]->transfer_flags |= URB_ASYNC_UNLINK;
 	usb_unlink_urb(in->urb[1]);
 
 	if (in->mode != L1_MODE_NULL) {


-- 
Karsten Keil
SuSE Labs
ISDN development