Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-driverfs-test

diff --cc drivers/scsi/sr.c
index 1d527d6f9096c5f307729860480820c74fbd572b,458487c1f7f2bd9d857eb0e64501a1a1581c044f..6be5cdac0797930ccb40ee63bcd6cd37e4dcaa3d
--- 1/drivers/scsi/sr.c
--- 2/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@@ -734,10 -734,10 +734,10 @@@ static ssize_t sr_device_kdev_read(stru
                                   char *page, size_t count, loff_t off)
  {
        kdev_t kdev; 
 -      kdev.value=(int)driverfs_dev->driver_data;
 +      kdev.value=(int)(long)driverfs_dev->driver_data;
        return off ? 0 : sprintf(page, "%x\n",kdev.value);
  }
- static DEVICE_ATTR(kdev,"kdev",S_IRUGO,sr_device_kdev_read,NULL);
+ static DEVICE_ATTR(kdev,S_IRUGO,sr_device_kdev_read,NULL);
  
  static ssize_t sr_device_type_read(struct device *driverfs_dev, 
                                   char *page, size_t count, loff_t off) 

diff --cc drivers/scsi/st.c
index b84bcc5378b2c776a606ac4af75151f7f58c975a,8ce4ca4898278b3441262460f2e88ca82b903775..eff9e16feee420954784547c6163a9f787fca05d
--- 1/drivers/scsi/st.c
--- 2/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@@ -3530,10 -3530,10 +3530,10 @@@ static ssize_t st_device_kdev_read(stru
                                   char *page, size_t count, loff_t off)
  {
        kdev_t kdev; 
 -      kdev.value=(int)driverfs_dev->driver_data;
 +      kdev.value=(int)(long)driverfs_dev->driver_data;
        return off ? 0 : sprintf(page, "%x\n",kdev.value);
  }
- static DEVICE_ATTR(kdev,"kdev",S_IRUGO,st_device_kdev_read,NULL);
+ static DEVICE_ATTR(kdev,S_IRUGO,st_device_kdev_read,NULL);
  
  static ssize_t st_device_type_read(struct device *driverfs_dev, 
                                   char *page, size_t count, loff_t off) 

diff --cc drivers/usb/core/usb.c
index 03fdc5368f7db7228722957dfae3a2bbb0c492d1,d5a25bbf50cd994afffd02217bee5f2bc92b5cc4..66aa698687c886a05ba3d858efdd699f2bcecf1b
--- 1/drivers/usb/core/usb.c
--- 2/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@@ -863,14 -863,12 +863,14 @@@ static ssize_t show_product (struct dev
                return 0;
        udev = to_usb_device (dev);
  
 -      len = usb_string(udev, udev->descriptor.iProduct, buf, PAGE_SIZE); 
 +      len = usb_string(udev, udev->descriptor.iProduct, buf, PAGE_SIZE);
 +      if (len < 0)
 +              return 0;
        buf[len] = '\n';
 -      buf[len+1] = 0x00;
 +      buf[len+1] = 0;
        return len+1;
  }
- static DEVICE_ATTR(product,"product",S_IRUGO,show_product,NULL);
+ static DEVICE_ATTR(product,S_IRUGO,show_product,NULL);
  
  /* manufacturer driverfs file */
  static ssize_t
@@@ -883,14 -881,12 +883,14 @@@ show_manufacturer (struct device *dev, 
                return 0;
        udev = to_usb_device (dev);
  
 -      len = usb_string(udev, udev->descriptor.iManufacturer, buf, PAGE_SIZE); 
 +      len = usb_string(udev, udev->descriptor.iManufacturer, buf, PAGE_SIZE);
 +      if (len < 0)
 +              return 0;
        buf[len] = '\n';
 -      buf[len+1] = 0x00;
 +      buf[len+1] = 0;
        return len+1;
  }
- static DEVICE_ATTR(manufacturer,"manufacturer",S_IRUGO,show_manufacturer,NULL);
+ static DEVICE_ATTR(manufacturer,S_IRUGO,show_manufacturer,NULL);
  
  /* serial number driverfs file */
  static ssize_t
@@@ -903,14 -899,12 +903,14 @@@ show_serial (struct device *dev, char *
                return 0;
        udev = to_usb_device (dev);
  
 -      len = usb_string(udev, udev->descriptor.iSerialNumber, buf, PAGE_SIZE); 
 +      len = usb_string(udev, udev->descriptor.iSerialNumber, buf, PAGE_SIZE);
 +      if (len < 0)
 +              return 0;
        buf[len] = '\n';
 -      buf[len+1] = 0x00;
 +      buf[len+1] = 0;
        return len+1;
  }
- static DEVICE_ATTR(serial,"serial",S_IRUGO,show_serial,NULL);
+ static DEVICE_ATTR(serial,S_IRUGO,show_serial,NULL);
  
  /*
   * This entrypoint gets called for each new device.

diff --cc fs/partitions/check.c
Simple merge