Commit 4d71332e authored by David S. Miller's avatar David S. Miller

drivers/scsi/sr.c: Fix casting between pointer and int.

parent d5fffb38
...@@ -734,7 +734,7 @@ static ssize_t sr_device_kdev_read(struct device *driverfs_dev, ...@@ -734,7 +734,7 @@ static ssize_t sr_device_kdev_read(struct device *driverfs_dev,
char *page, size_t count, loff_t off) char *page, size_t count, loff_t off)
{ {
kdev_t kdev; 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); 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,"kdev",S_IRUGO,sr_device_kdev_read,NULL);
...@@ -800,7 +800,7 @@ void sr_finish() ...@@ -800,7 +800,7 @@ void sr_finish()
&SCp->device->sdev_driverfs_dev; &SCp->device->sdev_driverfs_dev;
SCp->cdi.cdrom_driverfs_dev.bus = &scsi_driverfs_bus_type; SCp->cdi.cdrom_driverfs_dev.bus = &scsi_driverfs_bus_type;
SCp->cdi.cdrom_driverfs_dev.driver_data = 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_register(&SCp->cdi.cdrom_driverfs_dev);
device_create_file(&SCp->cdi.cdrom_driverfs_dev, device_create_file(&SCp->cdi.cdrom_driverfs_dev,
&dev_attr_type); &dev_attr_type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment