Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad3c7e42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  siimage: fix kernel oops on PPC 44x
parents 6ea0a467 c976816b

drivers/ide/pci/siimage.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static void proc_reports_siimage (struct pci_dev *dev, u8 clocking, const char * 
 

static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name)

{

	unsigned long bar5	= pci_resource_start(dev, 5);

	resource_size_t bar5	= pci_resource_start(dev, 5);

	unsigned long barsize	= pci_resource_len(dev, 5);

	u8 tmpbyte	= 0;

	void __iomem *ioaddr;