forked from rpms/kernel
		
	Linux 3.1-rc9
The patch-3.1-rc9.bz2 file is generated from git again. One day, kernel.org will come back.
This commit is contained in:
		
							parent
							
								
									904dbb1acd
								
							
						
					
					
						commit
						8260326a96
					
				| @ -51,7 +51,7 @@ Summary: The Linux kernel | |||||||
| # For non-released -rc kernels, this will be prepended with "0.", so | # For non-released -rc kernels, this will be prepended with "0.", so | ||||||
| # for example a 3 here will become 0.3 | # for example a 3 here will become 0.3 | ||||||
| # | # | ||||||
| %global baserelease 1 | %global baserelease 0 | ||||||
| %global fedora_build %{baserelease} | %global fedora_build %{baserelease} | ||||||
| 
 | 
 | ||||||
| # base_sublevel is the kernel version we're starting with and patching | # base_sublevel is the kernel version we're starting with and patching | ||||||
| @ -82,7 +82,7 @@ Summary: The Linux kernel | |||||||
| # The next upstream release sublevel (base_sublevel+1) | # The next upstream release sublevel (base_sublevel+1) | ||||||
| %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) | %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) | ||||||
| # The rc snapshot level | # The rc snapshot level | ||||||
| %define rcrev 8 | %define rcrev 9 | ||||||
| # The git snapshot level | # The git snapshot level | ||||||
| %define gitrev 0 | %define gitrev 0 | ||||||
| # Set rpm version accordingly | # Set rpm version accordingly | ||||||
| @ -720,7 +720,6 @@ Patch12303: dmar-disable-when-ricoh-multifunction.patch | |||||||
| 
 | 
 | ||||||
| Patch13002: revert-efi-rtclock.patch | Patch13002: revert-efi-rtclock.patch | ||||||
| Patch13003: efi-dont-map-boot-services-on-32bit.patch | Patch13003: efi-dont-map-boot-services-on-32bit.patch | ||||||
| Patch13005: ucvideo-fix-crash-when-linking-entities.patch |  | ||||||
| 
 | 
 | ||||||
| Patch13007: add-macbookair41-keyboard.patch | Patch13007: add-macbookair41-keyboard.patch | ||||||
| 
 | 
 | ||||||
| @ -1332,7 +1331,6 @@ ApplyPatch dmar-disable-when-ricoh-multifunction.patch | |||||||
| 
 | 
 | ||||||
| ApplyPatch revert-efi-rtclock.patch | ApplyPatch revert-efi-rtclock.patch | ||||||
| ApplyPatch efi-dont-map-boot-services-on-32bit.patch | ApplyPatch efi-dont-map-boot-services-on-32bit.patch | ||||||
| ApplyPatch ucvideo-fix-crash-when-linking-entities.patch |  | ||||||
| 
 | 
 | ||||||
| ApplyPatch add-macbookair41-keyboard.patch | ApplyPatch add-macbookair41-keyboard.patch | ||||||
| 
 | 
 | ||||||
| @ -2051,6 +2049,9 @@ fi | |||||||
| #                 ||----w | | #                 ||----w | | ||||||
| #                 ||     || | #                 ||     || | ||||||
| %changelog | %changelog | ||||||
|  | * Wed Oct 05 2011 Josh Boyer <jwboyer@redhat.com> | ||||||
|  | - Linux 3.1-rc9 | ||||||
|  | 
 | ||||||
| * Thu Sep 29 2011 Josh Boyer <jwboyer@redhat.com> | * Thu Sep 29 2011 Josh Boyer <jwboyer@redhat.com> | ||||||
| - Update logitech USB quirk patch | - Update logitech USB quirk patch | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								sources
									
									
									
									
									
								
							| @ -1,2 +1,2 @@ | |||||||
| 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2 | 398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2 | ||||||
| aae4a0422f4be618fcdbf4bf9de67143  patch-3.1-rc8.bz2 | 85fd0d4c9701392b6eb9293035726a02  patch-3.1-rc9.bz2 | ||||||
|  | |||||||
| @ -1,34 +0,0 @@ | |||||||
| The uvc_mc_register_entity() function wrongfully selects the |  | ||||||
| media_entity associated with a UVC entity when creating links. This |  | ||||||
| results in access to uninitialized media_entity structures and can hit a |  | ||||||
| BUG_ON statement in media_entity_create_link(). Fix it. |  | ||||||
| 
 |  | ||||||
| Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |  | ||||||
| ---
 |  | ||||||
|  drivers/media/video/uvc/uvc_entity.c |    2 +- |  | ||||||
|  1 files changed, 1 insertions(+), 1 deletions(-) |  | ||||||
| 
 |  | ||||||
| This patch should fix a v3.0 regression that results in a kernel crash as |  | ||||||
| reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637740 and |  | ||||||
| https://bugzilla.redhat.com/show_bug.cgi?id=735437. |  | ||||||
| 
 |  | ||||||
| Test results will be welcome. |  | ||||||
| 
 |  | ||||||
| diff --git a/drivers/media/video/uvc/uvc_entity.c b/drivers/media/video/uvc/uvc_entity.c
 |  | ||||||
| index 48fea37..29e2399 100644
 |  | ||||||
| --- a/drivers/media/video/uvc/uvc_entity.c
 |  | ||||||
| +++ b/drivers/media/video/uvc/uvc_entity.c
 |  | ||||||
| @@ -49,7 +49,7 @@ static int uvc_mc_register_entity(struct uvc_video_chain *chain,
 |  | ||||||
|  		if (remote == NULL) |  | ||||||
|  			return -EINVAL; |  | ||||||
|   |  | ||||||
| -		source = (UVC_ENTITY_TYPE(remote) != UVC_TT_STREAMING)
 |  | ||||||
| +		source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING)
 |  | ||||||
|  		       ? (remote->vdev ? &remote->vdev->entity : NULL) |  | ||||||
|  		       : &remote->subdev.entity; |  | ||||||
|  		if (source == NULL) |  | ||||||
| -- 
 |  | ||||||
| Regards, |  | ||||||
| 
 |  | ||||||
| Laurent Pinchart |  | ||||||
| 
 |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user