linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Alexey Klimov" <klimov.linux@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
	linux-next@vger.kernel.org,
	Mauro Carvalho Chehab <mchehab@redhat.com>,
	Douglas Schilling Landgraf <dougsland@gmail.com>
Subject: Re: linux-next: manual merge of the usb tree
Date: Tue, 14 Oct 2008 09:44:07 +0400	[thread overview]
Message-ID: <208cbae30810132244k89e8ce7p5d7423c008a5fc77@mail.gmail.com> (raw)
In-Reply-To: <20081014143137.007fe44c.sfr@canb.auug.org.au>

Hi, all

On Tue, Oct 14, 2008 at 7:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/media/radio/dsbr100.c between commit
> 90b698dd47f3929f20746f828e2cd648bc6539dd ("V4L/DVB (9151): dsbr100: Add
> returns and fix codingstyle for vidioc_s_ctrl") from Linus' tree and
> commit 58e43f3f48c28cc35be7502b5aa81ce53de51815 ("USB: remove warn()
> macro from usb media drivers") from the usb tree.

Let's see the flight of time: i sent this patch to v4l-dvb team, may
be simultaneously warn()-statements were removed from all usb-devices,
but i didn't saw it. Actually i didn't know about it. (I saw patch
about removing info()-macros) Probably there is bad delay between
USB-subsystem-tree and V4L-tree.

> Just trivial overlaps.  I fixed it up (see below).
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
>
> diff --cc drivers/media/radio/dsbr100.c
> index 66783ff,bbd237d..0000000
> --- a/drivers/media/radio/dsbr100.c
> +++ b/drivers/media/radio/dsbr100.c
> @@@ -360,15 -360,13 +360,17 @@@ static int vidioc_s_ctrl(struct file *f
>        switch (ctrl->id) {
>        case V4L2_CID_AUDIO_MUTE:
>                if (ctrl->value) {
>  -                      if (dsbr100_stop(radio)==-1)
>  +                      if (dsbr100_stop(radio) == -1) {
> -                               warn("Radio did not respond properly");
> +                               dev_warn(&radio->usbdev->dev,
> +                                        "Radio did not respond properly\n");
>  +                              return -EBUSY;
>  +                      }
>                } else {
>  -                      if (dsbr100_start(radio)==-1)
>  +                      if (dsbr100_start(radio) == -1) {
> -                               warn("Radio did not respond properly");
> +                               dev_warn(&radio->usbdev->dev,
> +                                        "Radio did not respond properly\n");
>  +                              return -EBUSY;
>  +                      }
>                }
>                return 0;
>        }
> @@@ -416,9 -413,9 +418,10 @@@ static int usb_dsbr100_open(struct inod
>        radio->muted = 1;
>
>        if (dsbr100_start(radio)<0) {
> -               warn("Radio did not start up properly");
> +               dev_warn(&radio->usbdev->dev,
> +                        "Radio did not start up properly\n");
>                radio->users = 0;
>  +              unlock_kernel();
>                return -EIO;
>        }
>        dsbr100_setfreq(radio, radio->curfreq);

-- 
Best regards, Klimov Alexey

  reply	other threads:[~2008-10-14  5:44 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-14  3:31 linux-next: manual merge of the usb tree Stephen Rothwell
2008-10-14  5:44 ` Alexey Klimov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-10-22 15:08 linux-next: Tree for Oct 22 Thierry Reding
2013-10-22 15:08 ` linux-next: manual merge of the usb tree Thierry Reding
2013-10-22 18:02   ` Srinivas Pandruvada
2008-11-10  1:06 Stephen Rothwell
2008-11-10  1:40 ` Greg KH
2008-10-14  3:53 Stephen Rothwell
2008-10-14  3:47 Stephen Rothwell
2008-10-14  3:37 Stephen Rothwell
2008-10-14  3:27 Stephen Rothwell
2008-07-17  0:54 Stephen Rothwell
2008-07-17  7:04 ` Greg KH
2008-07-16  2:02 Stephen Rothwell
2008-07-16  2:30 ` Greg KH
2008-07-16  7:06 ` Jaswinder Singh
2008-07-16  7:13   ` Stephen Rothwell
2008-07-16  7:20     ` Jaswinder Singh
2008-07-16  7:45       ` Stephen Rothwell
2008-07-16  7:49         ` Jaswinder Singh
2008-07-16  7:58           ` Stephen Rothwell
2008-07-07  3:09 Stephen Rothwell
2008-07-07 14:09 ` Alan Stern
2008-07-07 16:09   ` Stephen Rothwell

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=208cbae30810132244k89e8ce7p5d7423c008a5fc77@mail.gmail.com \
    --to=klimov.linux@gmail.com \
    --cc=dougsland@gmail.com \
    --cc=greg@kroah.com \
    --cc=linux-next@vger.kernel.org \
    --cc=mchehab@redhat.com \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).