diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-09-10 01:07:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-09-10 01:07:34 -0700 |
| commit | 8c81fe769b7d40bfbf47d9c9bdffabadbccd885c (patch) | |
| tree | 8fe76c3e23c6a0269152cfd6d935ade7d5e160b5 | |
| parent | f6d83d1a9ae0dbd0e8efdf6c266d57af82e0c5d7 (diff) | |
| download | patches-8c81fe769b7d40bfbf47d9c9bdffabadbccd885c.tar.gz | |
2.6.27-rc5-git11
| -rw-r--r-- | usb/usb-remove-info-macro-from-usb.h.patch | 2 | ||||
| -rw-r--r-- | usb/usb-remove-warn-macro-from-usb.h.patch | 2 | ||||
| -rw-r--r-- | version | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/usb/usb-remove-info-macro-from-usb.h.patch b/usb/usb-remove-info-macro-from-usb.h.patch index d4b81dc0238958..f4bde07a17177b 100644 --- a/usb/usb-remove-info-macro-from-usb.h.patch +++ b/usb/usb-remove-info-macro-from-usb.h.patch @@ -307,7 +307,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/media/video/dabusb.c +++ b/drivers/media/video/dabusb.c -@@ -865,7 +865,8 @@ static int __init dabusb_init (void) +@@ -866,7 +866,8 @@ static int __init dabusb_init (void) dbg("dabusb_init: driver registered"); diff --git a/usb/usb-remove-warn-macro-from-usb.h.patch b/usb/usb-remove-warn-macro-from-usb.h.patch index 2f3704d44c0af9..9aa3114751f52e 100644 --- a/usb/usb-remove-warn-macro-from-usb.h.patch +++ b/usb/usb-remove-warn-macro-from-usb.h.patch @@ -517,7 +517,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> @@ -494,7 +497,7 @@ static int usb_dsbr100_probe(struct usb_ radio->curfreq = FREQ_MIN*FREQ_MUL; video_set_drvdata(radio->videodev, radio); - if (video_register_device(radio->videodev, VFL_TYPE_RADIO,radio_nr)) { + if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) { - warn("Could not register video device"); + dev_warn(&intf->dev, "Could not register video device\n"); video_device_release(radio->videodev); @@ -1 +1 @@ -2.6.27-rc5 +2.6.27-rc5-git11 |