rpms/kernel/F-9 kernel.spec, 1.702, 1.703 linux-2.6-usb-storage-nikond80-quirk.patch, 1.1, 1.2

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20077

Modified Files:
	kernel.spec linux-2.6-usb-storage-nikond80-quirk.patch 
Log Message:
Better fix for the Nikon D80 usb-storage quirk.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.702
retrieving revision 1.703
diff -u -r1.702 -r1.703
--- kernel.spec	3 Jul 2008 21:45:52 -0000	1.702
+++ kernel.spec	4 Jul 2008 20:01:01 -0000	1.703
@@ -1864,6 +1864,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Jul 04 2008 Dave Jones <davej at redhat.com>
+- Better fix for the Nikon D80 usb-storage quirk.
+
 * Thu Jul 03 2008 Dave Jones <davej at redhat.com>
 - Add USB Storage quirk for Nikon D40 with new firmware.
 

linux-2.6-usb-storage-nikond80-quirk.patch:

Index: linux-2.6-usb-storage-nikond80-quirk.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-usb-storage-nikond80-quirk.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-usb-storage-nikond80-quirk.patch	3 Jul 2008 21:45:52 -0000	1.1
+++ linux-2.6-usb-storage-nikond80-quirk.patch	4 Jul 2008 20:01:01 -0000	1.2
@@ -1,19 +1,21 @@
+usb-storage: quirk around v1.11 firmware on Nikon D40
+
+https://bugzilla.redhat.com/show_bug.cgi?id=454028
+Just as in earlier firmware versions, we need to perform this
+quirk for the latest version too.
+
+Signed-off-by: Dave Jones <davej at redhat.com>
+
 diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
-index 45fe366..cf03af1 100644
+index 39a7c11..1a497e9 100644
 --- a/drivers/usb/storage/unusual_devs.h
 +++ b/drivers/usb/storage/unusual_devs.h
-@@ -364,6 +364,13 @@ UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
- 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+@@ -358,7 +358,7 @@ UNUSUAL_DEV(  0x04b0, 0x040f, 0x0100, 0x0200,
  		US_FL_FIX_CAPACITY),
  
-+/* Reported by https://bugzilla.redhat.com/show_bug.cgi?id=454028 */
-+UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0111,
-+		"NIKON",
-+		"NIKON DSC D40",
-+		US_SC_DEVICE, US_PR_DEVICE, NULL,
-+		US_FL_FIX_CAPACITY),
-+
- /* Reported by Ortwin Glueck <odi at odi.ch> */
- UNUSUAL_DEV(  0x04b0, 0x0413, 0x0110, 0x0110,
+ /* Reported by Emil Larsson <emil at swip.net> */
+-UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0110,
++UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0111,
  		"NIKON",
-
+ 		"NIKON DSC D80",
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,