]> git.hungrycats.org Git - linux/commitdiff
drivers/scsi/sr.c: Fix casting between pointer and int.
authorDavid S. Miller <davem@nuts.ninka.net>
Mon, 12 Aug 2002 08:26:32 +0000 (01:26 -0700)
committerDavid S. Miller <davem@nuts.ninka.net>
Mon, 12 Aug 2002 08:26:32 +0000 (01:26 -0700)
drivers/scsi/sr.c

index a4cc0f40d948c737c2b05725e84ae8498680e776..1d527d6f9096c5f307729860480820c74fbd572b 100644 (file)
@@ -734,7 +734,7 @@ static ssize_t sr_device_kdev_read(struct device *driverfs_dev,
                                   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);
@@ -800,7 +800,7 @@ void sr_finish()
                        &SCp->device->sdev_driverfs_dev;
                SCp->cdi.cdrom_driverfs_dev.bus = &scsi_driverfs_bus_type;
                SCp->cdi.cdrom_driverfs_dev.driver_data = 
-                       (void *)__mkdev(MAJOR_NR, i);
+                       (void *)(long)__mkdev(MAJOR_NR, i);
                device_register(&SCp->cdi.cdrom_driverfs_dev);
                device_create_file(&SCp->cdi.cdrom_driverfs_dev,
                                   &dev_attr_type);